wip: switch to niri

Looks cooler c:

flake.lock

@@ -289,11 +289,11 @@
         "xwayland-satellite-unstable": []
       },
       "locked": {
-        "lastModified": 1739042449,
-        "narHash": "sha256-9zLFUpEebwhjCgtznsI61gTzefI3+fuXATHUOFzJi5w=",
+        "lastModified": 1741686876,
+        "narHash": "sha256-Kt37Zm9YcQoe/aRVbPFydZcfwIrEAg/U+iz3FcxsOZs=",
         "owner": "sodiboo",
         "repo": "niri-flake",
-        "rev": "98e3666a9dc4143cbf93d957a15d749b5acef046",
+        "rev": "fa230971ab63885ba5666588a7b78f75f73d5a85",
         "type": "github"
       },
       "original": {
@@ -305,16 +305,16 @@
     "niri-stable": {
       "flake": false,
       "locked": {
-        "lastModified": 1736614405,
-        "narHash": "sha256-AJ1rlgNOPb3/+DbS5hkhm21t6Oz8IgqLllwmZt0lyzk=",
+        "lastModified": 1740117926,
+        "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
         "owner": "YaLTeR",
         "repo": "niri",
-        "rev": "e05bc269e678ecf828b96ae79c991c13b00b38a5",
+        "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
         "type": "github"
       },
       "original": {
         "owner": "YaLTeR",
-        "ref": "v25.01",
+        "ref": "v25.02",
         "repo": "niri",
         "type": "github"
       }
@@ -520,16 +520,16 @@
     "xwayland-satellite-stable": {
       "flake": false,
       "locked": {
-        "lastModified": 1730166465,
-        "narHash": "sha256-nq7bouXQXaaPPo/E+Jbq+wNHnatD4dY8OxSrRqzvy6s=",
+        "lastModified": 1739246919,
+        "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
         "owner": "Supreeeme",
         "repo": "xwayland-satellite",
-        "rev": "a713cf46cb7db84a0d1b57c3a397c610cad3cf98",
+        "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
         "type": "github"
       },
       "original": {
         "owner": "Supreeeme",
-        "ref": "v0.5",
+        "ref": "v0.5.1",
         "repo": "xwayland-satellite",
         "type": "github"
       }

home/gui/default.nix

@@ -169,21 +169,24 @@ in
             workspaces = lib.range 1 9;
             # Run function for each workspace
             perWorkspace = f: lib.mergeAttrsList (builtins.map f workspaces);
+            # alias for concatStringsSep
+            joinWith = lib.strings.concatStringsSep;
           in
           with config.lib.niri.actions;
           {
             # Open Terminal
-            "${mod}+Return".action.spawn = config.jhome.gui.terminalCommand;
+            "${mod}+Return".action.spawn =
+              if config.jhome.gui.terminal == "alacritty" then "alacritty" else config.jhome.gui.terminalCommand;
             # Open menu
             "${mod}+D".action =
               spawn "${lib.getExe pkgs.fuzzel}" "--terminal"
-                "${builtins.concatStringSep " " terminalCommand}";
+                "${joinWith " " config.jhome.gui.terminalCommand}";
             # Close Window
             "${mod}+Q".action = close-window;
             # Fullscreen
             "${mod}+F".action = fullscreen-window;
             # Hotkey help menu
-            "${mod}+Shift+/".action = show-hotkey-overlay;
+            "${mod}+Shift+Slash".action = show-hotkey-overlay;
             # Media Keys
             "XF86AudioRaiseVolume" = {
               action = spawn "${pkgs.avizo}/bin/volumectl" "up";
@@ -197,8 +200,9 @@ in
               action = spawn "${pkgs.avizo}/bin/volumectl" "toggle-mute";
               allow-when-locked = true;
             };
+            # FIXME: swaylock is missing so this doesn't work anyways
             # Lock screen
-            "XF86ScreenSaver".action = spawn "swaylock" "--image" "${cfg.background}";
+            # "XF86ScreenSaver".action = spawn "swaylock" "--image" "${cfg.background}";
             # Screen brightness
             "XF86MonBrightnessUp".action = spawn "${pkgs.avizo}/bin/lightctl" "up";
             "XF86MonBrightnessDown".action = spawn "${pkgs.avizo}/bin/lightctl" "down";