niri: updated many things

5 files changed, 28 insertions, 7 deletions

diff --git a/home-manager/features/gui/desktops/niri/parts/fuzzel.nix b/home-manager/features/gui/desktops/niri/parts/fuzzel.nix
index e939f88..1d44625 100755
--- a/home-manager/features/gui/desktops/niri/parts/fuzzel.nix
+++ b/home-manager/features/gui/desktops/niri/parts/fuzzel.nix
@@ -9,7 +9,7 @@ in {
       settings = {
         main = {
           width = 20;
-          #terminal = config.custom.libraries.default-applications.terminal-emulator.command;
+          terminal = config.default-applications.terminal-emulator.runTuiCommand;
         };
         border = {
           width = 3;
diff --git a/home-manager/features/gui/desktops/niri/parts/niri/default.nix b/home-manager/features/gui/desktops/niri/parts/niri/default.nix
index e850b53..e804839 100644
--- a/home-manager/features/gui/desktops/niri/parts/niri/default.nix
+++ b/home-manager/features/gui/desktops/niri/parts/niri/default.nix
@@ -26,7 +26,7 @@ in {
           {command = ["waybar"];}
 
           # Wallpaper Daemon
-          {command = ["swww-daemon"];}
+          {command = ["swww-init"];}
 
           # Allows x apps to be used in wayland.
           {command = ["${lib.getExe pkgs.xwayland-satellite}"];}
@@ -64,6 +64,12 @@ in {
           backdrop-color = "#${aes.scheme.base01}";
         };
         layout = {
+          default-column-display = "tabbed";
+          tab-indicator = {
+            hide-when-single-tab = true;
+            active.color = "#${aes.scheme.base0D}";
+            urgent.color = "#${aes.scheme.base0A}";
+          };
           gaps = 14;
           insert-hint.enable = false;
           shadow = {
diff --git a/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix b/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix
index 28cb4c2..91ccd30 100644
--- a/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix
+++ b/home-manager/features/gui/desktops/niri/parts/niri/keybinds.nix
@@ -24,7 +24,7 @@
       "Mod+B".action.spawn = ["makoctl" "dismiss" "-a"];
 
       # Selectors
-      "Mod+R".action.spawn = ["fuzzel"];
+      "Mod+R".action.spawn = ["fuzzel" "--placeholder" "Apps"];
       "Mod+T".action.spawn = ["tool-selector"];
       "Mod+Y".action.spawn = ["clipboard-selector"];
       "Mod+U".action.spawn = ["wallpaper-selector" "--all-outputs"];
@@ -47,7 +47,9 @@
       # Vertical Tiling Keys
       "Mod+Shift+A".action.reset-window-height = [];
       "Mod+Shift+S".action.switch-preset-window-height = [];
-      "Mod+D".action.consume-or-expel-window-right = [];
+      "Mod+D".action.consume-window-into-column = [];
+      "Mod+Shift+D".action.expel-window-from-column = [];
+      "Mod+Control+D".action.toggle-column-tabbed-display = [];
 
       # Floating Window Management Keys
       "Mod+Z".action.switch-focus-between-floating-and-tiling = [];
diff --git a/home-manager/features/gui/desktops/niri/parts/selectors.nix b/home-manager/features/gui/desktops/niri/parts/selectors.nix
index 1adc917..1100f63 100644
--- a/home-manager/features/gui/desktops/niri/parts/selectors.nix
+++ b/home-manager/features/gui/desktops/niri/parts/selectors.nix
@@ -37,8 +37,11 @@ in {
             "manage bluetooth": {
               foot ${lib.getExe pkgs.bluetui}
             }
+            "manage displays": {
+              ${lib.getExe wdisplays}
+            }
             "create qr-code": {
-              let temp_file = mktemp
+              let temp_file = mktemp -t
               let qr_code_bin = ${lib.getExe pkgs.qrtool} encode (${pkgs.wl-clipboard}/bin/wl-paste)
               $qr_code_bin | ${pkgs.wl-clipboard}/bin/wl-copy
               $qr_code_bin | save -f $temp_file
@@ -114,7 +117,7 @@ in {
         writers.writeNuBin "clipboard-selector" ''
           ${lib.getExe pkgs.cliphist} list
             | cut -f 2-
-            | ${lib.getExe pkgs.fuzzel} --dmenu
+            | ${lib.getExe pkgs.fuzzel} --dmenu --placeholder "Clipboard"
             | ${pkgs.wl-clipboard}/bin/wl-copy
         ''
       )
diff --git a/home-manager/features/gui/desktops/niri/parts/swww.nix b/home-manager/features/gui/desktops/niri/parts/swww.nix
index dca163b..ce4002c 100755
--- a/home-manager/features/gui/desktops/niri/parts/swww.nix
+++ b/home-manager/features/gui/desktops/niri/parts/swww.nix
@@ -1,8 +1,18 @@
 { config, pkgs, lib, ... }: let
   cfg = config.features.gui.desktops.niri.parts.swww;
+  aes = config.aesthetics;
 in {
   options.features.gui.desktops.niri.parts.swww.enable = lib.mkEnableOption "swww";
   config = lib.mkIf cfg.enable {
-    home.packages = [pkgs.swww];
+    home.packages = [
+      pkgs.swww
+      (pkgs.writers.writeNuBin "swww-init" ''
+        niri msg action spawn -- swww-daemon
+
+        if not ("~/.cache/swww" | path expand | path exists) {
+          swww img ${aes.wallpaper}
+        }
+      '')
+    ];
   };
 }