Add Hyprland, attempt generalization

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

@@ -1,23 +1,22 @@
 { pkgs, ... }:
 {
   config.home.niri.settings.autostart = pkgs.writeText "autostart" ''
-    // Everpresent bar
     spawn-at-startup "waybar"
     
-    // Daemons and tray apps
+    // Daemons and tray
     spawn-at-startup "hyprpaper"
     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
+    // Foreground
     spawn-at-startup "librewolf" "-p" "Misc" "--name" "MiscBrowser"
+    spawn-at-startup "thunderbird"
     spawn-at-startup "vesktop"
     spawn-at-startup "fractal"
     spawn-at-startup "telegram-desktop"
-    spawn-at-startup "thunderbird"
   '';
 }

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

@@ -17,21 +17,21 @@
       ${primeMod}+F4 { spawn "sh" "-c" "virt-manager | notify-send \"Virtual Machines\""; }
       ${primeMod}+F5 { spawn "sh" "-c" "looking-glass-client input:rawMouse=yes | notify-send \"Looking Glass\""; }
     
-      // ${primeMod} + key
+      // Prime + key
       ${primeMod}+s { spawn "sh" "-c" "rofi -show run -p Command"; }
       ${primeMod}+c { spawn "sh" "-c" "clipman pick -t rofi"; }
       ${primeMod}+x { spawn "sh" "-c" "rofiscripts --power"; }
       ${primeMod}+b { spawn "sh" "-c" "pkill -USR1 waybar"; }
       ${primeMod}+Return { spawn "sh" "-c" "foot"; }
     
-      // ${primeMod} + shift + key
+      // Prime + shift + key
       ${primeMod}+Shift+s { spawn "sh" "-c" "rofi -show drun -modi drun -drun-display-format {name} -show-icons -disable-history"; }
       ${primeMod}+Shift+t { spawn "sh" "-c" "pcmanfm"; }
       ${primeMod}+Shift+e { spawn "sh" "-c" "bemoji -n -P 0"; }
       ${primeMod}+Shift+b { spawn "sh" "-c" "rofi-bluetooth"; }
       ${primeMod}+Shift+Return { spawn "sh" "-c" "foot ranger"; }
     
-      // ${primeMod} + ctrl + key
+      // Prime + ctrl + key
       ${primeMod}+Ctrl+s { spawn "sh" "-c" "rofiscripts --scratchpads"; }
       ${primeMod}+Ctrl+c { spawn "sh" "-c" "wlpicker && notify-send \"Color copied to clipboard\""; }