diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index a5c8fa1..7aeed9c 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -84,6 +84,22 @@ in {
     #   extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
     # };
 
+    systemd.user.services.noctalia-shell = {
+      Unit = {
+        Description = "Noctalia shell service";
+        PartOf = [config.wayland.systemd.target];
+        Before = [config.wayland.systemd.target];
+      };
+
+      Install.WantedBy = [config.wayland.systemd.target];
+
+      Service = {
+        ExecStart = "${inputs.noctalia.packages.${pkgs.system}.default}/bin/noctalia-shell";
+        Restart = "on-failure";
+        RestartSec = 5;
+      };
+    };
+
     programs.niri = {
       enable = true;
       package = pkgs.niri-unstable;
@@ -96,9 +112,9 @@ in {
           enable = true;
           path = lib.getExe pkgs.xwayland-satellite-unstable;
         };
-        spawn-at-startup = [
-          {argv = ["noctalia-shell"];}
-        ];
+        # spawn-at-startup = [
+        #   {argv = ["noctalia-shell"];}
+        # ];
         clipboard.disable-primary = true;
         input = {
           focus-follows-mouse.enable = true;
@@ -175,17 +191,21 @@ in {
             "Mod+Shift+Down".action = config.lib.niri.actions.move-window-down-or-to-workspace-down;
             "Mod+Shift+Up".action = config.lib.niri.actions.move-window-up-or-to-workspace-up;
 
-            # "Mod+Control+Left".action = config.lib.niri.actions.consume-or-expel-window-left;
-            # "Mod+Control+Right".action = config.lib.niri.actions.consume-or-expel-window-right;
-
             "Mod+Space".action = config.lib.niri.actions.toggle-window-floating;
-
             "Mod+F".action = config.lib.niri.actions.fullscreen-window;
-
             "Mod+M".action = config.lib.niri.actions.maximize-column;
-
             "Mod+O".action = config.lib.niri.actions.toggle-overview;
 
+            "Mod+Control+Right".action = config.lib.niri.actions.focus-monitor-right;
+            "Mod+Control+Left".action = config.lib.niri.actions.focus-monitor-left;
+            "Mod+Control+Up".action = config.lib.niri.actions.focus-monitor-up;
+            "Mod+Control+Down".action = config.lib.niri.actions.focus-monitor-down;
+
+            "Mod+Control+Shift+Right".action = config.lib.niri.actions.move-window-to-monitor-right;
+            "Mod+Control+Shift+Left".action = config.lib.niri.actions.move-window-to-monitor-left;
+            "Mod+Control+Shift+Up".action = config.lib.niri.actions.move-window-to-monitor-up;
+            "Mod+Control+Shift+Down".action = config.lib.niri.actions.move-window-to-monitor-down;
+
             # "$mod, left,  hy3:movefocus, l"
             # "$mod, right, hy3:movefocus, r"
             # "$mod, up,    hy3:movefocus, u"