Merge branch 'dendritic' of git.jckrinsky.net:nixosconf into dendritic

4 files changed, 81 insertions, 26 deletions

diff --git a/modules/packages/niri/hosts/tiamat.nix b/modules/packages/niri/hosts/tiamat.nix
index 39113db..859968d 100644
--- a/modules/packages/niri/hosts/tiamat.nix
+++ b/modules/packages/niri/hosts/tiamat.nix
@@ -35,12 +35,19 @@
   perSystem = {
     pkgs,
     lib,
+    config,
+    self',
     ...
   }: {
     packages.tiamatNiri = inputs.wrapper-modules.wrappers.niri.wrap {
       inherit pkgs;
       imports = [
-        self.wrapperModules.niri
+        (self.wrapperModules.niri {
+          inherit pkgs;
+          inherit lib;
+          inherit config;
+          noctalia-shell = self'.packages.noctalia-shell;
+        })
         {
           config.settings.extraConfig = ''
             output "eDP-1" {
diff --git a/modules/packages/niri/hosts/vecna.nix b/modules/packages/niri/hosts/vecna.nix
index f90f53e..de0b1cd 100644
--- a/modules/packages/niri/hosts/vecna.nix
+++ b/modules/packages/niri/hosts/vecna.nix
@@ -35,12 +35,19 @@
   perSystem = {
     pkgs,
     lib,
+    config,
+    self',
     ...
   }: {
     packages.vecnaNiri = inputs.wrapper-modules.wrappers.niri.wrap {
       inherit pkgs;
       imports = [
-        self.wrapperModules.niri
+        (self.wrapperModules.niri {
+          inherit pkgs;
+          inherit lib;
+          inherit config;
+          noctalia-shell = self'.packages.vecna-noctalia-shell;
+        })
         {
           config.settings.extraConfig = ''
             output "DP-3" {
@@ -52,6 +59,37 @@
               scale 1
               position x=-1920 y=150
             }
+
+            workspace "w0" {
+              open-on-output "DP-3"
+            }
+            workspace "w1" {
+              open-on-output "DP-3"
+            }
+            workspace "w2" {
+              open-on-output "DP-3"
+            }
+            workspace "w3" {
+              open-on-output "DP-3"
+            }
+            workspace "w4" {
+              open-on-output "DP-3"
+            }
+            workspace "w5" {
+              open-on-output "HDMI-A-1"
+            }
+            workspace "w6" {
+              open-on-output "HDMI-A-1"
+            }
+            workspace "w7" {
+              open-on-output "HDMI-A-1"
+            }
+            workspace "w8" {
+              open-on-output "HDMI-A-1"
+            }
+            workspace "w9" {
+              open-on-output "HDMI-A-1"
+            }
           '';
         }
       ];
diff --git a/modules/packages/niri/package.nix b/modules/packages/niri/package.nix
index 729d997..63d3ff1 100644
--- a/modules/packages/niri/package.nix
+++ b/modules/packages/niri/package.nix
@@ -22,10 +22,16 @@
     environment.systemPackages = [pkgs.wlr-randr];
   };
 
-  perSystem = {pkgs, ...}: {
+  perSystem = {pkgs, lib, self', ...}: {
     packages.niri = inputs.wrapper-modules.wrappers.niri.wrap {
       inherit pkgs;
-      imports = [self.wrapperModules.niri];
+      imports = [
+        (self.wrapperModules.niri {
+          inherit pkgs;
+          inherit lib;
+          noctalia-shell = self'.packages.noctalia-shell;
+        })
+      ];
     };
   };
 }
diff --git a/modules/packages/niri/settings.nix b/modules/packages/niri/settings.nix
index 897bc50..42f9ab2 100644
--- a/modules/packages/niri/settings.nix
+++ b/modules/packages/niri/settings.nix
@@ -3,8 +3,11 @@
     lib,
     config,
     pkgs,
+    noctalia-shell,
     ...
-  }: {
+  }: let
+    noctaliaExe = lib.getExe noctalia-shell;
+  in {
     settings = {
       input = {
         focus-follows-mouse = {};
@@ -20,6 +23,12 @@
           tap = {};
           dwt = {};
         };
+
+        mouse = {
+          accel-profile = "flat";
+          accel-speed = -0.35;
+          scroll-factor = 0.8;
+        };
       };
 
       layout = {
@@ -27,6 +36,9 @@
 
         preset-column-widths = [
           {
+            proportion = 0.33;
+          }
+          {
             proportion = 0.5;
           }
           {
@@ -38,17 +50,18 @@
         ];
       };
 
-      xwayland-satellite.path = lib.getExe config.pkgs.xwayland-satellite;
+      xwayland-satellite.path = lib.getExe pkgs.xwayland-satellite;
       prefer-no-csd = {};
       hotkey-overlay.skip-at-startup = {};
+      gestures.hot-corners.off = {};
 
       binds = {
         "Mod+Shift+M".quit = {};
-        "Mod+M".spawn-sh = "${lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.noctalia-shell} ipc call sessionMenu toggle";
+        "Mod+M".spawn-sh = "${noctaliaExe} ipc call sessionMenu toggle";
 
-        "Mod+F1".spawn-sh = "${lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.noctalia-shell} ipc call launcher toggle";
-        "Mod+F2".spawn = lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.terminal;
-        "Mod+F3".spawn = lib.getExe config.pkgs.thunar;
+        "Mod+F1".spawn-sh = "${noctaliaExe} ipc call launcher toggle";
+        "Mod+F2".spawn = lib.getExe self.packages.${pkgs.stdenv.hostPlatform.system}.terminal;
+        "Mod+F3".spawn = lib.getExe pkgs.thunar;
         "Mod+F4".close-window = {};
 
         "Mod+R".switch-preset-column-width = {};
@@ -75,8 +88,8 @@
         "Mod+Shift+9".move-column-to-workspace = "w8";
         "Mod+Shift+0".move-column-to-workspace = "w9";
 
-        "Mod+WheelScrollDown".focus-column-left = {};
-        "Mod+WheelScrollUp".focus-column-right = {};
+        "Mod+WheelScrollUp".focus-column-left = {};
+        "Mod+WheelScrollDown".focus-column-right = {};
         "Mod+Shift+WheelScrollDown".focus-workspace-down = {};
         "Mod+Shift+WheelScrollUp".focus-workspace-up = {};
 
@@ -96,25 +109,16 @@
         "XF86AudioLowerVolume".spawn-sh = "wpctl set-volume -l 1.5 @DEFAULT_AUDIO_SINK@ 5%-";
         "XF86AudioMute".spawn-sh = "wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
 
-        "XF86MonBrightnessUp".spawn-sh = "${lib.getExe config.pkgs.brightnessctl} set 5%+";
-        "XF86MonBrightnessDown".spawn-sh = "${lib.getExe config.pkgs.brightnessctl} set 5%-";
+        "XF86MonBrightnessUp".spawn-sh = "${noctaliaExe} brightness increase";
+        "XF86MonBrightnessDown".spawn-sh = "${noctaliaExe} brightness decrease";
       };
 
-      workspaces = {
-        "w0" = {};
-        "w1" = {};
-        "w2" = {};
-        "w3" = {};
-        "w4" = {};
-        "w5" = {};
-        "w6" = {};
-        "w7" = {};
-        "w8" = {};
-        "w9" = {};
+      switch-events = {
+        lid-close.spawn = "${noctaliaExe} ipc call lockScreen lock";
       };
 
       spawn-at-startup = [
-        (lib.getExe self.packages.${config.pkgs.stdenv.hostPlatform.system}.noctalia-shell)
+        (noctaliaExe)
       ];
     };
   };