dentritic refactor

modules/home/niri/default.nix

@@ -1,10 +0,0 @@
-{ ... }:
-{
-  imports = [
-    ./niri/env.nix
-    ./niri/execs.nix
-    ./niri/general.nix
-    ./niri/rules.nix
-    ./niri/keybinds.nix
-  ];
-}

modules/home/niri/desktop-niri-env.ulu.nix

@@ -0,0 +1,21 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-env =
+    { ... }:
+    {
+      programs.niri.settings = {
+        environment = {
+          DISPLAY = ":0";
+          XCURSOR_SIZE = "24";
+          TERMINAL = "ghostty";
+          XCURSOR_THEME = "macOS";
+          GDK_BACKEND = "wayland,x11";
+          QT_QPA_PLATFORMTHEME = "kde";
+          QT_QPA_PLATFORM = "wayland;xcb";
+          MESA_GL_VERSION_OVERRIDE = "4.6";
+          MESA_GLSL_VERSION_OVERRIDE = "460";
+          ELECTRON_OZONE_PLATFORM_HINT = "auto";
+        };
+      };
+    };
+}

modules/home/niri/desktop-niri-execs.ulu.nix

@@ -0,0 +1,28 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-execs =
+    { ... }:
+    {
+      programs.niri.settings = {
+        "prefer-no-csd" = true;
+        spawn-at-startup = [
+          { command = [ "noctalia" ]; }
+          { command = [ "xwayland-satellite" ]; }
+          {
+            command = [
+              "sh"
+              "-c"
+              "wl-paste --type text --watch cliphist store"
+            ];
+          }
+          {
+            command = [
+              "sh"
+              "-c"
+              "wl-paste --type image --watch cliphist store"
+            ];
+          }
+        ];
+      };
+    };
+}

modules/home/niri/desktop-niri-general.ulu.nix

@@ -0,0 +1,84 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-general =
+    { ... }:
+    {
+      programs.niri.settings = {
+        input = {
+          keyboard = {
+            xkb = {
+              layout = "tr";
+            };
+            repeat-delay = 250;
+            repeat-rate = 35;
+          };
+          mouse = {
+            accel-speed = 0.0;
+            accel-profile = "flat";
+          };
+          touchpad = {
+            tap = true;
+            natural-scroll = true;
+            scroll-factor = 0.5;
+            click-method = "clickfinger";
+          };
+          focus-follows-mouse = {
+            max-scroll-amount = "0%";
+          };
+        };
+
+        outputs = {
+          "LVDS-1" = {
+            position = {
+              x = 0;
+              y = 0;
+            };
+          };
+          "HDMI-A-1" = {
+            position = {
+              x = -277;
+              y = -1080;
+            };
+          };
+        };
+
+        animations = {
+          slowdown = 0.8;
+        };
+
+        layout = {
+          gaps = 5;
+          struts = {
+            left = -5;
+            right = -5;
+            top = -5;
+            bottom = -5;
+          };
+          center-focused-column = "never";
+          preset-column-widths = [
+            { proportion = 0.33333; }
+            { proportion = 0.5; }
+            { proportion = 0.66667; }
+          ];
+          default-column-width = {
+            proportion = 1.0;
+          };
+          focus-ring = {
+            enable = false;
+          };
+          border = {
+            enable = false;
+          };
+        };
+
+        layer-rules = [
+          {
+            matches = [
+              { namespace = "^noctalia-backdrop"; }
+            ];
+            place-within-backdrop = true;
+          }
+        ];
+      };
+    };
+}

modules/home/niri/desktop-niri-home.ulu.nix

@@ -0,0 +1,8 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-home =
+    { ... }:
+    {
+      programs.niri.enable = true;
+    };
+}

modules/home/niri/desktop-niri-keybinds.ulu.nix

@@ -0,0 +1,168 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-keybinds =
+    { ... }:
+    {
+      programs.niri.settings = {
+        binds = {
+          # --- Workspace Navigation ---
+          "Ctrl+Mod+Right".action.focus-column-right = [ ];
+          "Ctrl+Mod+Left".action.focus-column-left = [ ];
+          "Ctrl+Mod+Down".action.focus-workspace-down = [ ];
+          "Ctrl+Mod+Up".action.focus-workspace-up = [ ];
+          "Ctrl+Mod+Shift+Right".action.move-column-right = [ ];
+          "Ctrl+Mod+Shift+Left".action.move-column-left = [ ];
+          "Ctrl+Mod+Shift+Down".action.move-window-to-workspace-down = [ ];
+          "Ctrl+Mod+Shift+Up".action.move-window-to-workspace-up = [ ];
+
+          "Ctrl+Mod+WheelScrollUp" = {
+            "cooldown-ms" = 150;
+            action.focus-column-right = [ ];
+          };
+          "Ctrl+Mod+WheelScrollDown" = {
+            "cooldown-ms" = 150;
+            action.focus-column-left = [ ];
+          };
+
+          # --- Interface ---
+          "Mod+Space".action.spawn-sh = "noctalia msg panel-toggle launcher";
+          "Mod+P".action.spawn-sh = "noctalia msg panel-toggle control-center";
+          "Mod+Tab".action.toggle-overview = [ ];
+          "Ctrl+Alt+Delete".action.spawn-sh = "noctalia msg panel-toggle session";
+
+          # --- Launchers ---
+          "Mod+Return".action.spawn = [ "ghostty" ];
+          "Mod+W".action.spawn = [ "zen-beta" ];
+          "Mod+E".action.spawn = [ "dolphin" ];
+          "Mod+Z".action.spawn = [ "code" ];
+          "Mod+Alt+V".action.spawn = [ "pavucontrol" ];
+          "Mod+Shift+V".action.spawn-sh = "noctalia msg panel-toggle clipboard";
+          "Mod+Shift+L".action.spawn-sh = "noctalia msg lock";
+          "Mod+Shift+S".action.spawn-sh = "noctalia msg screenshot-region";
+          "Ctrl+Shift+Escape".action.spawn = [
+            "ghostty"
+            "-e"
+            "sudo"
+            "btop"
+          ];
+
+          # --- Window Management ---
+          "Mod+Q".action.close-window = [ ];
+          "Mod+Alt+Space".action.toggle-window-floating = [ ];
+          "Mod+F".action.fullscreen-window = [ ];
+          "Mod+D".action.maximize-column = [ ];
+
+          # --- Focus ---
+          "Mod+Left".action.focus-column-left = [ ];
+          "Mod+Right".action.focus-column-right = [ ];
+          "Mod+Up".action.focus-window-up = [ ];
+          "Mod+Down".action.focus-window-down = [ ];
+
+          # --- Move Windows ---
+          "Mod+Shift+Left".action.move-column-left = [ ];
+          "Mod+Shift+Right".action.move-column-right = [ ];
+          "Mod+Shift+Up".action.move-window-up = [ ];
+          "Mod+Shift+Down".action.move-window-down = [ ];
+
+          # --- Workspaces by Number ---
+          "Mod+1".action.focus-workspace = 1;
+          "Mod+2".action.focus-workspace = 2;
+          "Mod+3".action.focus-workspace = 3;
+          "Mod+4".action.focus-workspace = 4;
+          "Mod+5".action.focus-workspace = 5;
+          "Mod+6".action.focus-workspace = 6;
+          "Mod+7".action.focus-workspace = 7;
+          "Mod+8".action.focus-workspace = 8;
+          "Mod+9".action.focus-workspace = 9;
+          "Mod+0".action.focus-workspace = 10;
+
+          "Mod+Shift+1".action.move-window-to-workspace = 1;
+          "Mod+Shift+2".action.move-window-to-workspace = 2;
+          "Mod+Shift+3".action.move-window-to-workspace = 3;
+          "Mod+Shift+4".action.move-window-to-workspace = 4;
+          "Mod+Shift+5".action.move-window-to-workspace = 5;
+          "Mod+Shift+6".action.move-window-to-workspace = 6;
+          "Mod+Shift+7".action.move-window-to-workspace = 7;
+          "Mod+Shift+8".action.move-window-to-workspace = 8;
+          "Mod+Shift+9".action.move-window-to-workspace = 9;
+          "Mod+Shift+0".action.move-window-to-workspace = 10;
+
+          # --- Mouse Workspace Scroll ---
+          "Mod+WheelScrollDown" = {
+            "cooldown-ms" = 150;
+            action.focus-workspace-down = [ ];
+          };
+          "Mod+WheelScrollUp" = {
+            "cooldown-ms" = 150;
+            action.focus-workspace-up = [ ];
+          };
+
+          # --- Media & Hardware Keys ---
+          "Mod+Shift+N".action.spawn = [
+            "playerctl"
+            "next"
+          ];
+          "Mod+Shift+B".action.spawn = [
+            "playerctl"
+            "previous"
+          ];
+          "Mod+Shift+P".action.spawn = [
+            "playerctl"
+            "play-pause"
+          ];
+
+          "XF86AudioRaiseVolume" = {
+            "allow-when-locked" = true;
+            action.spawn-sh = "noctalia msg volume-up";
+          };
+          "XF86AudioLowerVolume" = {
+            "allow-when-locked" = true;
+            action.spawn-sh = "noctalia msg volume-down";
+          };
+          "XF86AudioMute" = {
+            "allow-when-locked" = true;
+            action.spawn-sh = "noctalia msg volume-mute";
+          };
+          "XF86AudioMicMute" = {
+            "allow-when-locked" = true;
+            action.spawn = [
+              "wpctl"
+              "set-mute"
+              "@DEFAULT_SOURCE@"
+              "toggle"
+            ];
+          };
+          "XF86MonBrightnessUp".action.spawn-sh = "noctalia msg brightness-up";
+          "XF86MonBrightnessDown".action.spawn-sh = "noctalia msg brightness-down";
+          "XF86AudioNext" = {
+            "allow-when-locked" = true;
+            action.spawn = [
+              "playerctl"
+              "next"
+            ];
+          };
+          "XF86AudioPrev" = {
+            "allow-when-locked" = true;
+            action.spawn = [
+              "playerctl"
+              "previous"
+            ];
+          };
+          "XF86AudioPlay" = {
+            "allow-when-locked" = true;
+            action.spawn = [
+              "playerctl"
+              "play-pause"
+            ];
+          };
+          "XF86AudioPause" = {
+            "allow-when-locked" = true;
+            action.spawn = [
+              "playerctl"
+              "play-pause"
+            ];
+          };
+        };
+      };
+    };
+}

modules/home/niri/desktop-niri-rules.ulu.nix

@@ -0,0 +1,62 @@
+{ ... }:
+{
+  flake.homeModules.desktop-niri-rules =
+    { ... }:
+    {
+      programs.niri.settings = {
+        window-rules = [
+          {
+            matches = [ { title = "Open File.*"; } ];
+            open-floating = true;
+          }
+          {
+            matches = [ { title = "Save As.*"; } ];
+            open-floating = true;
+          }
+          {
+            matches = [ { title = "File Upload.*"; } ];
+            open-floating = true;
+          }
+          {
+            matches = [ { "app-id" = "pavucontrol"; } ];
+            open-floating = true;
+            default-column-width = {
+              fixed = 800;
+            };
+          }
+          {
+            matches = [ { title = "(?i)picture.in.picture"; } ];
+            open-floating = true;
+          }
+          {
+            matches = [ { "app-id" = "steam"; } ];
+            open-floating = true;
+          }
+          {
+            matches = [
+              {
+                "app-id" = "steam";
+                title = "Steam";
+              }
+            ];
+            open-floating = false;
+          }
+          {
+            matches = [
+              {
+                "app-id" = "steam";
+                title = "^notificationtoasts_.*";
+              }
+            ];
+            open-floating = true;
+            open-focused = false;
+            default-floating-position = {
+              x = 20;
+              y = 20;
+              "relative-to" = "bottom-right";
+            };
+          }
+        ];
+      };
+    };
+}

modules/home/niri/niri/env.nix

@@ -1,18 +0,0 @@
-{ ... }:
-
-{
-  programs.niri.settings = {
-    environment = {
-      DISPLAY = ":0";
-      XCURSOR_SIZE = "24";
-      TERMINAL = "ghostty";
-      XCURSOR_THEME = "macOS";
-      GDK_BACKEND = "wayland,x11";
-      QT_QPA_PLATFORMTHEME = "kde";
-      QT_QPA_PLATFORM = "wayland;xcb";
-      MESA_GL_VERSION_OVERRIDE = "4.6";
-      MESA_GLSL_VERSION_OVERRIDE = "460";
-      ELECTRON_OZONE_PLATFORM_HINT = "auto";
-    };
-  };
-}

modules/home/niri/niri/execs.nix

@@ -1,13 +0,0 @@
-{ ... }:
-
-{
-  programs.niri.settings = {
-    "prefer-no-csd" = true;
-    spawn-at-startup = [
-      { command = [ "noctalia" ]; }
-      { command = [ "xwayland-satellite" ]; }
-      { command = [ "sh" "-c" "wl-paste --type text --watch cliphist store" ]; }
-      { command = [ "sh" "-c" "wl-paste --type image --watch cliphist store" ]; }
-    ];
-  };
-}

modules/home/niri/niri/general.nix

@@ -1,81 +0,0 @@
-{ ... }:
-
-{
-  programs.niri.settings = {
-    input = {
-      keyboard = {
-        xkb = {
-          layout = "tr";
-        };
-        repeat-delay = 250;
-        repeat-rate = 35;
-      };
-      mouse = {
-        accel-speed = 0.0;
-        accel-profile = "flat";
-      };
-      touchpad = {
-        tap = true;
-        natural-scroll = true;
-        scroll-factor = 0.5;
-        click-method = "clickfinger";
-      };
-      focus-follows-mouse = {
-        max-scroll-amount = "0%";
-      };
-    };
-
-    outputs = {
-      "LVDS-1" = {
-        position = {
-          x = 0;
-          y = 0;
-        };
-      };
-      "HDMI-A-1" = {
-        position = {
-          x = -277;
-          y = -1080;
-        };
-      };
-    };
-
-    animations = {
-      slowdown = 0.8;
-    };
-
-    layout = {
-      gaps = 5;
-      struts = {
-        left = -5;
-        right = -5;
-        top = -5;
-        bottom = -5;
-      };
-      center-focused-column = "never";
-      preset-column-widths = [
-        { proportion = 0.33333; }
-        { proportion = 0.5; }
-        { proportion = 0.66667; }
-      ];
-      default-column-width = {
-        proportion = 1.0;
-      };
-      focus-ring = {
-        enable = false;
-      };
-      border = {
-        enable = false;
-      };
-    };
-
-    layer-rules = [
-      {
-        matches = [
-          { namespace = "^noctalia-backdrop"; }
-        ];
-        place-within-backdrop = true;
-      }
-    ];
-  };
-}

modules/home/niri/niri/keybinds.nix

@@ -1,165 +0,0 @@
-{ ... }:
-
-{
-  programs.niri.settings = {
-    binds = {
-      # --- Workspace Navigation ---
-      "Ctrl+Mod+Right".action.focus-column-right = [ ];
-      "Ctrl+Mod+Left".action.focus-column-left = [ ];
-      "Ctrl+Mod+Down".action.focus-workspace-down = [ ];
-      "Ctrl+Mod+Up".action.focus-workspace-up = [ ];
-      "Ctrl+Mod+Shift+Right".action.move-column-right = [ ];
-      "Ctrl+Mod+Shift+Left".action.move-column-left = [ ];
-      "Ctrl+Mod+Shift+Down".action.move-window-to-workspace-down = [ ];
-      "Ctrl+Mod+Shift+Up".action.move-window-to-workspace-up = [ ];
-
-      "Ctrl+Mod+WheelScrollUp" = {
-        "cooldown-ms" = 150;
-        action.focus-column-right = [ ];
-      };
-      "Ctrl+Mod+WheelScrollDown" = {
-        "cooldown-ms" = 150;
-        action.focus-column-left = [ ];
-      };
-
-      # --- Interface ---
-      "Mod+Space".action.spawn-sh = "noctalia msg panel-toggle launcher";
-      "Mod+P".action.spawn-sh = "noctalia msg panel-toggle control-center";
-      "Mod+Tab".action.toggle-overview = [ ];
-      "Ctrl+Alt+Delete".action.spawn-sh = "noctalia msg panel-toggle session";
-
-      # --- Launchers ---
-      "Mod+Return".action.spawn = [ "ghostty" ];
-      "Mod+W".action.spawn = [ "zen-beta" ];
-      "Mod+E".action.spawn = [ "dolphin" ];
-      "Mod+Z".action.spawn = [ "code" ];
-      "Mod+Alt+V".action.spawn = [ "pavucontrol" ];
-      "Mod+Shift+V".action.spawn-sh = "noctalia msg panel-toggle clipboard";
-      "Mod+Shift+L".action.spawn-sh = "noctalia msg lock";
-      "Mod+Shift+S".action.spawn-sh = "noctalia msg screenshot-region";
-      "Ctrl+Shift+Escape".action.spawn = [
-        "ghostty"
-        "-e"
-        "sudo"
-        "btop"
-      ];
-
-      # --- Window Management ---
-      "Mod+Q".action.close-window = [ ];
-      "Mod+Alt+Space".action.toggle-window-floating = [ ];
-      "Mod+F".action.fullscreen-window = [ ];
-      "Mod+D".action.maximize-column = [ ];
-
-      # --- Focus ---
-      "Mod+Left".action.focus-column-left = [ ];
-      "Mod+Right".action.focus-column-right = [ ];
-      "Mod+Up".action.focus-window-up = [ ];
-      "Mod+Down".action.focus-window-down = [ ];
-
-      # --- Move Windows ---
-      "Mod+Shift+Left".action.move-column-left = [ ];
-      "Mod+Shift+Right".action.move-column-right = [ ];
-      "Mod+Shift+Up".action.move-window-up = [ ];
-      "Mod+Shift+Down".action.move-window-down = [ ];
-
-      # --- Workspaces by Number ---
-      "Mod+1".action.focus-workspace = 1;
-      "Mod+2".action.focus-workspace = 2;
-      "Mod+3".action.focus-workspace = 3;
-      "Mod+4".action.focus-workspace = 4;
-      "Mod+5".action.focus-workspace = 5;
-      "Mod+6".action.focus-workspace = 6;
-      "Mod+7".action.focus-workspace = 7;
-      "Mod+8".action.focus-workspace = 8;
-      "Mod+9".action.focus-workspace = 9;
-      "Mod+0".action.focus-workspace = 10;
-
-      "Mod+Shift+1".action.move-window-to-workspace = 1;
-      "Mod+Shift+2".action.move-window-to-workspace = 2;
-      "Mod+Shift+3".action.move-window-to-workspace = 3;
-      "Mod+Shift+4".action.move-window-to-workspace = 4;
-      "Mod+Shift+5".action.move-window-to-workspace = 5;
-      "Mod+Shift+6".action.move-window-to-workspace = 6;
-      "Mod+Shift+7".action.move-window-to-workspace = 7;
-      "Mod+Shift+8".action.move-window-to-workspace = 8;
-      "Mod+Shift+9".action.move-window-to-workspace = 9;
-      "Mod+Shift+0".action.move-window-to-workspace = 10;
-
-      # --- Mouse Workspace Scroll ---
-      "Mod+WheelScrollDown" = {
-        "cooldown-ms" = 150;
-        action.focus-workspace-down = [ ];
-      };
-      "Mod+WheelScrollUp" = {
-        "cooldown-ms" = 150;
-        action.focus-workspace-up = [ ];
-      };
-
-      # --- Media & Hardware Keys ---
-      "Mod+Shift+N".action.spawn = [
-        "playerctl"
-        "next"
-      ];
-      "Mod+Shift+B".action.spawn = [
-        "playerctl"
-        "previous"
-      ];
-      "Mod+Shift+P".action.spawn = [
-        "playerctl"
-        "play-pause"
-      ];
-
-      "XF86AudioRaiseVolume" = {
-        "allow-when-locked" = true;
-        action.spawn-sh = "noctalia msg volume-up";
-      };
-      "XF86AudioLowerVolume" = {
-        "allow-when-locked" = true;
-        action.spawn-sh = "noctalia msg volume-down";
-      };
-      "XF86AudioMute" = {
-        "allow-when-locked" = true;
-        action.spawn-sh = "noctalia msg volume-mute";
-      };
-      "XF86AudioMicMute" = {
-        "allow-when-locked" = true;
-        action.spawn = [
-          "wpctl"
-          "set-mute"
-          "@DEFAULT_SOURCE@"
-          "toggle"
-        ];
-      };
-      "XF86MonBrightnessUp".action.spawn-sh = "noctalia msg brightness-up";
-      "XF86MonBrightnessDown".action.spawn-sh = "noctalia msg brightness-down";
-      "XF86AudioNext" = {
-        "allow-when-locked" = true;
-        action.spawn = [
-          "playerctl"
-          "next"
-        ];
-      };
-      "XF86AudioPrev" = {
-        "allow-when-locked" = true;
-        action.spawn = [
-          "playerctl"
-          "previous"
-        ];
-      };
-      "XF86AudioPlay" = {
-        "allow-when-locked" = true;
-        action.spawn = [
-          "playerctl"
-          "play-pause"
-        ];
-      };
-      "XF86AudioPause" = {
-        "allow-when-locked" = true;
-        action.spawn = [
-          "playerctl"
-          "play-pause"
-        ];
-      };
-    };
-  };
-}

modules/home/niri/niri/rules.nix

@@ -1,47 +0,0 @@
-{ ... }:
-
-{
-  programs.niri.settings = {
-    window-rules = [
-      {
-        matches = [ { title = "Open File.*"; } ];
-        open-floating = true;
-      }
-      {
-        matches = [ { title = "Save As.*"; } ];
-        open-floating = true;
-      }
-      {
-        matches = [ { title = "File Upload.*"; } ];
-        open-floating = true;
-      }
-      {
-        matches = [ { "app-id" = "pavucontrol"; } ];
-        open-floating = true;
-        default-column-width = { fixed = 800; };
-      }
-      {
-        matches = [ { title = "(?i)picture.in.picture"; } ];
-        open-floating = true;
-      }
-      {
-        matches = [ { "app-id" = "steam"; } ];
-        open-floating = true;
-      }
-      {
-        matches = [ { "app-id" = "steam"; title = "Steam"; } ];
-        open-floating = false;
-      }
-      {
-        matches = [ { "app-id" = "steam"; title = "^notificationtoasts_.*"; } ];
-        open-floating = true;
-        open-focused = false;
-        default-floating-position = {
-          x = 20;
-          y = 20;
-          "relative-to" = "bottom-right";
-        };
-      }
-    ];
-  };
-}