From 6361ad60f800f51f880074efaec8cfb8cdb24a3b Mon Sep 17 00:00:00 2001 From: waveringana Date: Mon, 16 Jun 2025 04:17:13 -0400 Subject: [PATCH 1/2] we --- common/bluetooth.nix | 8 +++ common/desktop/core.nix | 5 ++ common/desktop/sway.nix | 1 + home/regent/home.nix | 94 ++++++++++++++++++++++---- hosts/focalor/default.nix | 3 + hosts/focalor/scripts/vm-win11-hook.sh | 3 +- 6 files changed, 100 insertions(+), 14 deletions(-) create mode 100644 common/bluetooth.nix diff --git a/common/bluetooth.nix b/common/bluetooth.nix new file mode 100644 index 0000000..cbb24dc --- /dev/null +++ b/common/bluetooth.nix @@ -0,0 +1,8 @@ +{config, lib ,...} + +{ + hardware.bluetooth.enable = true; + hardware.bluetooth.powerOnBoot = true; + + services.blueman.enable = true; +} diff --git a/common/desktop/core.nix b/common/desktop/core.nix index d03941d..0ff1ff3 100755 --- a/common/desktop/core.nix +++ b/common/desktop/core.nix @@ -10,6 +10,11 @@ hyfetch sway-contrib.grimshot discord + pamixer + ]; + + fonts.packages = [ + pkgs.nerd-fonts.fira-code ]; environment.sessionVariables.NIXOS_OZONE_WL = "1"; diff --git a/common/desktop/sway.nix b/common/desktop/sway.nix index 10c3505..f6514b4 100755 --- a/common/desktop/sway.nix +++ b/common/desktop/sway.nix @@ -20,6 +20,7 @@ in programs.sway = { enable = true; wrapperFeatures.gtk = true; + package = pkgs.swayfx; }; environment.sessionVariables = { diff --git a/home/regent/home.nix b/home/regent/home.nix index 2902573..a72a81f 100755 --- a/home/regent/home.nix +++ b/home/regent/home.nix @@ -1,4 +1,4 @@ -{ config, pkgs, system, inputs, ... }: +{ config, pkgs, system, inputs, lib, ... }: { home.username = "regent"; @@ -13,6 +13,8 @@ };*/ ghostty.enable = true; ghostty.flavor = "mocha"; + nvim.enable = true; + nvim.flavor = "mocha"; }; programs.ghostty.enable = true; @@ -21,7 +23,20 @@ theme = "catppuccin-mocha"; }; - home.pointerCursor = { + programs.neovim.enable = true; + programs.neovim = { + extraPackages = with pkgs; [ + lua-language-server + stylua + ripgrep + ]; + + plugins = with pkgs.vimPlugins; [ + lazy-nvim + ]; + }; + + home.pointerCursor = { gtk.enable = true; package = pkgs.phinger-cursors; name = "Phinger-cursors-light"; @@ -61,7 +76,7 @@ * { - font-family: FantasqueSansMono Nerd Font; + font-family: 'Fira Code', monospace; font-size: 17px; min-height: 0; } @@ -71,7 +86,7 @@ window#waybar { margin: 0px; border: 0px; /*background-color:rgb(0, 0, 0);*/ - background-color: rgba(0, 0, 0, 0.9); + background-color: @base; color: @text; } @@ -82,11 +97,10 @@ window#waybar { #workspaces { border-radius: 1rem; margin: 5px; - background-color: @surface0; margin-left: 1rem; + background-color: rgba(0, 0, 0, 0.21); } - #workspaces button { color: @lavender; border-radius: 1rem; @@ -96,6 +110,7 @@ window#waybar { #workspaces button.active { color: @sky; border-radius: 1rem; + background-color: rgba(255, 255, 255, 0.5); } #workspaces button:hover { @@ -111,35 +126,88 @@ window#waybar { #pulseaudio, #custom-lock, #custom-power { - background-color: @surface0; padding: 0.5rem 1rem; margin: 5px 0; + color: @text; } #clock { - color: @blue; + color: @text; border-radius: 0px 1rem 1rem 0px; margin-right: 1rem; } - ''; settings = { mainBar = { layer = "top"; position = "top"; - height = 34; + mod = "dock"; + exclusive = true; + passthrough = false; + #gtk-layer-shell = true; + height = 0; output = [ "HDMI-A-1" - "DP-2" + "DP-1" + ]; + modules-left = [ + "sway/workspaces" ]; - modules-left = [ "sway/workspaces" ]; modules-center = [ "sway/window" ]; - modules-right = [ "clock" ]; + modules-right = [ + "pulseaudio" + "clock" + ]; "sway/workspaces" = { disable-scroll = true; sort-by-name = true; }; + tray = { + icon-size = 13; + tooltip = false; + spacing = 10; + }; + network = { + format = "󰖩 {essid}"; + format-disconnected = "󰖪 disconnected"; + }; + clock = { + format = " {:%I:%M %p %m/%d} "; + tooltip-format = '' + {:%Y %B} + {calendar}''; + }; + + pulseaudio = { + format = "{icon} {volume}%"; + tooltip = false; + format-muted = " Muted"; + on-click = "pamixer -t"; + on-scroll-up = "pamixer -i 5"; + on-scroll-down = "pamixer -d 5"; + scroll-step = 5; + format-icons = { + headphone = ""; + hands-free = ""; + headset = ""; + phone = ""; + portable = ""; + car = ""; + default = [ "" "" "" ]; + }; + }; + + "pulseaudio#microphone" = { + format = "{format_source}"; + tooltip = false; + format-source = " {volume}%"; + format-source-muted = " Muted"; + on-click = "pamixer --default-source -t"; + on-scroll-up = "pamixer --default-source -i 5"; + on-scroll-down = "pamixer --default-source -d 5"; + scroll-step = 5; + }; }; }; }; diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix index 497f0f3..0b77d08 100755 --- a/hosts/focalor/default.nix +++ b/hosts/focalor/default.nix @@ -13,6 +13,7 @@ ../../common/users.nix ../../common/services.nix ../../common/efi.nix + ../../common/bluetooth.nix # Desktop modules ../../common/desktop/core.nix @@ -64,6 +65,8 @@ }; }; + programs.steam.enable = true; + /*networking = { firewall.enable = false; firewall.trustedInterfaces = [ diff --git a/hosts/focalor/scripts/vm-win11-hook.sh b/hosts/focalor/scripts/vm-win11-hook.sh index 6c9232e..fab6c4f 100755 --- a/hosts/focalor/scripts/vm-win11-hook.sh +++ b/hosts/focalor/scripts/vm-win11-hook.sh @@ -55,7 +55,8 @@ if [[ "$GUEST_NAME" != "win11" ]]; then fi if [[ "$HOOK_NAME" == "prepare" && "$STATE_NAME" == "begin" ]]; then - start_hook + #start_hook + echo "do nothing" elif [[ "$HOOK_NAME" == "release" && "$STATE_NAME" == "end" ]]; then revert_hook fi From 67e4051a2df2451a4030dc2ab3b5bc09376149d7 Mon Sep 17 00:00:00 2001 From: waveringana Date: Mon, 16 Jun 2025 06:33:24 -0400 Subject: [PATCH 2/2] bluetooth --- common/bluetooth.nix | 2 +- hosts/focalor/default.nix | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/common/bluetooth.nix b/common/bluetooth.nix index cbb24dc..5f33c6a 100644 --- a/common/bluetooth.nix +++ b/common/bluetooth.nix @@ -1,4 +1,4 @@ -{config, lib ,...} +{ config, lib ,... }: { hardware.bluetooth.enable = true; diff --git a/hosts/focalor/default.nix b/hosts/focalor/default.nix index 0b77d08..6d650ea 100755 --- a/hosts/focalor/default.nix +++ b/hosts/focalor/default.nix @@ -94,6 +94,15 @@ services.vscode-server.enable = true; services.vscode-server.nodejsPackage = pkgs.nodejs_20; + + programs.obs-studio = { + enable = true; + enableVirtualCamera = true; + plugins = with pkgs.obs-studio-plugins; [ + droidcam-obs + ]; + }; + environment.systemPackages = with pkgs; [ #lm_sensors #code-server