diff --git a/.vscode/settings.json b/.vscode/settings.json index 86b435d..e2749aa 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,4 +8,7 @@ "nixpkgs", "pkgs" ], + "search.exclude": { + "system-special-links": true, + } } \ No newline at end of file diff --git a/configs/niri/config.kdl b/configs/niri/config.kdl index 7a9e66d..db55b1b 100644 --- a/configs/niri/config.kdl +++ b/configs/niri/config.kdl @@ -79,6 +79,10 @@ output "Dell Inc. DELL SE3223Q 1WDWKK3" { scale 2 position x=0 y=-1080 } +output "Dell Inc. DELL SE3223Q 1TRXKK3" { + scale 2 + position x=1920 y=-1080 +} // ========================= // General layout @@ -192,12 +196,12 @@ binds { Mod+B { spawn "chromium" "--profile-directory=ProfilePersonal"; } Mod+Alt+B { spawn "chromium" "--profile-directory=ProfileWork"; } Mod+E { spawn "wofi-emoji"; } - XF86AudioRaiseVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1+"; } - XF86AudioLowerVolume allow-when-locked=true { spawn "wpctl" "set-volume" "@DEFAULT_AUDIO_SINK@" "0.1-"; } - XF86AudioMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SINK@" "toggle"; } - XF86AudioMicMute allow-when-locked=true { spawn "wpctl" "set-mute" "@DEFAULT_AUDIO_SOURCE@" "toggle"; } - XF86MonBrightnessUp { spawn "brightnessctl" "set" "10%+"; } - XF86MonBrightnessDown { spawn "brightnessctl" "set" "10%-"; } + XF86AudioRaiseVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "raise"; } + XF86AudioLowerVolume allow-when-locked=true { spawn "swayosd-client" "--output-volume" "lower"; } + XF86AudioMute allow-when-locked=true { spawn "swayosd-client" "--output-volume" "mute-toggle"; } + XF86AudioMicMute allow-when-locked=true { spawn "swayosd-client" "--input-volume" "mute-toggle"; } + XF86MonBrightnessUp allow-when-locked=true { spawn "swayosd-client" "--brightness" "raise"; } + XF86MonBrightnessDown allow-when-locked=true { spawn "swayosd-client" "--brightness" "lower"; } Mod+Alt+L { spawn "/run/current-system/sw/bin/makoctl" "dismiss" "-a"; } Mod+Left { focus-column-left; } diff --git a/configs/niri/waybar/bottom-bar.jsonc b/configs/niri/waybar/bottom-bar.jsonc index dc36fba..eaec4aa 100644 --- a/configs/niri/waybar/bottom-bar.jsonc +++ b/configs/niri/waybar/bottom-bar.jsonc @@ -1,4 +1,5 @@ { + "reload_style_on_change": true, "layer": "top", "position": "bottom", // Waybar at bottom layer "height": 32, diff --git a/configs/niri/waybar/top-bar.jsonc b/configs/niri/waybar/top-bar.jsonc index ead7c87..0b9cb2b 100644 --- a/configs/niri/waybar/top-bar.jsonc +++ b/configs/niri/waybar/top-bar.jsonc @@ -1,4 +1,5 @@ { + "reload_style_on_change": true, "layer": "top", // Waybar at top layer "height": 32, // Waybar height (to be removed for auto height) "margin-top": 4, diff --git a/hosts/fwbook.hardware-configuration.nix b/hosts/fwbook.hardware-configuration.nix index b089b96..01ea63b 100644 --- a/hosts/fwbook.hardware-configuration.nix +++ b/hosts/fwbook.hardware-configuration.nix @@ -11,7 +11,21 @@ boot.initrd.kernelModules = [ ]; boot.kernelModules = [ "kvm-amd" ]; boot.extraModulePackages = [ ]; + boot.plymouth = { + enable = true; + theme = "proxzima"; + themePackages = [ pkgs.plymouth-proxzima-theme ]; + }; + boot.consoleLogLevel = 3; + boot.initrd.verbose = false; + boot.kernelParams = [ + "quiet" + "splash" + "boot.shell_on_fail" + "udev.log_priority=3" + "rd.systemd.show_status=auto" + ]; fileSystems."/" = { device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1"; diff --git a/hosts/fwbook.nix b/hosts/fwbook.nix index b1f51f7..cbc9a24 100644 --- a/hosts/fwbook.nix +++ b/hosts/fwbook.nix @@ -65,8 +65,8 @@ in programs.zsh.initContent = '' source ${zshFunctions} ''; + services.blueman-applet.enable = true; }; - # Sunshine services.sunshine = { enable = false; diff --git a/modules/home/programs.nix b/modules/home/programs.nix index 0827d58..42f2d7d 100644 --- a/modules/home/programs.nix +++ b/modules/home/programs.nix @@ -94,7 +94,6 @@ zsh = { enable = true; enableCompletion = true; - completionInit = true; autosuggestion = { enable = true; strategy = [ diff --git a/modules/nixos/desktop/tiler/niri.nix b/modules/nixos/desktop/tiler/niri.nix index b8b61d1..f2882d4 100644 --- a/modules/nixos/desktop/tiler/niri.nix +++ b/modules/nixos/desktop/tiler/niri.nix @@ -32,6 +32,7 @@ in }; environment.systemPackages = with pkgs; [ hypridle + swayosd ]; system.userActivationScripts.niriConfig.text = skygUtils.makeHyperlinkScriptToConfigs { filePath = "niri"; @@ -61,6 +62,12 @@ in ${pkgs.hypridle}/bin/hypridle ''; }; + systemd.user.services.niri-swayosd = makeNiriSystemdService { + description = "Niri's swayosd"; + script = '' + ${pkgs.swayosd}/bin/swayosd-server + ''; + }; }; }