Add back more functions from Sway into Niri, add a standard naming scheme

modules/home/wms/niri/autostart/default.nix

@@ -6,12 +6,12 @@
     
     // Daemons and tray apps
     spawn-at-startup "hyprpaper"
-    spawn-at-startup "wl-paste" "-t" "text --watch clipman store -P"
+    spawn-at-startup "wl-paste" "-t" "text" "--watch" "clipman" "store" "-P"
     spawn-at-startup "wl-copy"
     spawn-at-startup "mako"
     spawn-at-startup "sunshine"
+    spawn-at-startup "xwayland-satellite"
     spawn-at-startup "${pkgs.mate.mate-polkit}/libexec/polkit-mate-authentication-agent-1"
-    spawn-at-startup "${pkgs.xwayland-satellite}/bin/xwayland-satellite"
     
     // Foreground apps
     spawn-at-startup "librewolf" "-p" "Misc" "--name" "MiscBrowser"

modules/home/wms/niri/default.nix

@@ -5,8 +5,8 @@
     ./hotkeys
     ./inputs
     ./outputs
+    ./programs
     ./rules
-    ./settings
     ./theme
   ];
 
@@ -16,7 +16,6 @@
     ${builtins.readFile config.home.niri.settings.inputs}
     ${builtins.readFile config.home.niri.settings.outputs}
     ${builtins.readFile config.home.niri.settings.rules}
-    ${builtins.readFile config.home.niri.settings.settings}
     ${builtins.readFile config.home.niri.settings.theme}
   '';
 }

modules/home/wms/niri/programs/default.nix

@@ -0,0 +1,6 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ./sleep-niri
+  ];
+}

modules/home/wms/niri/programs/sleep-niri/default.nix

@@ -0,0 +1,10 @@
+{ pkgs, config, ... }: 
+{
+  home.packages = with pkgs; [
+    (pkgs.writeScriptBin "sleep-niri" ''
+      swaylock & ${pkgs.swayidle}/bin/swayidle -w \
+        timeout 1 'niri msg action power-off-monitors' \
+        resume 'niri msg action power-on-monitors; pkill -9 swayidle'
+    '')
+  ];
+}

modules/home/wms/niri/rules/default.nix

@@ -38,5 +38,15 @@
       match app-id="com.obsproject.Studio"
       open-on-workspace "${config.ws.w4a}"
     }
+
+    screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
+    
+    hotkey-overlay {
+      skip-at-startup
+    }
+    
+    environment {
+      DISPLAY ":0"
+    }
   '';
 }

modules/home/wms/niri/settings/default.nix

@@ -1,14 +0,0 @@
-{ pkgs, ... }:
-{
-  config.home.niri.settings.settings = pkgs.writeText "settings" ''
-    screenshot-path "~/Pictures/Screenshots/Screenshot from %Y-%m-%d %H-%M-%S.png"
-    
-    hotkey-overlay {
-      skip-at-startup
-    }
-    
-    environment {
-      DISPLAY ":0"
-    }
-  '';
-}