diff --git a/common.nix b/common.nix
index fae1b43..f1362e4 100644
--- a/common.nix
+++ b/common.nix
@@ -22,7 +22,12 @@ all: inputs: {
 
   security.rtkit.enable = lib.mkDefault true;
 
-  services.earlyoom.enable = lib.mkDefault true;
+  systemd.oomd = {
+    enable = true;
+    enableSystemSlice = true;
+    enableRootSlice = true;
+    enableUserSlices = true;
+  };
 
   programs.mosh.enable = lib.mkDefault true;
 
diff --git a/flake.nix b/flake.nix
index d2c46c2..fc92bbe 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,29 +7,17 @@
     home-manager = {
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
-      inputs.utils.follows = "flake-utils";
     };
 
     rycee = {
       url = "gitlab:rycee/nur-expressions";
       flake = false;
     };
-    plasma-manager = {
-      url = "github:pjones/plasma-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.home-manager.follows = "home-manager";
-    };
-    # quickshell = {
-    #   url = "github:outfoxxed/quickshell";
-    #   inputs.nixpkgs.follows = "nixpkgs";
-    # };
     noctalia = {
-      url = "github:noctalia-dev/noctalia-shell";
-      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:noctalia-dev/noctalia/cachix";
     };
     niri = {
       url = "github:sodiboo/niri-flake";
-      inputs.nixpkgs.follows = "nixpkgs";
     };
 
     nix-index-database = {
@@ -39,8 +27,8 @@
   };
 
   nixConfig = {
-    extra-substituters = ["https://niri.cachix.org"];
-    extra-trusted-public-keys = ["niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964="];
+    extra-substituters = ["https://niri.cachix.org" "https://noctalia.cachix.org"];
+    extra-trusted-public-keys = ["niri.cachix.org-1:Wv0OmO7PsuocRKzfDoJ3mulSl7Z6oezYhGhR+3W2964=" "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4="];
   };
 
   outputs = {
diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix
index fc228d7..7ef885f 100644
--- a/home-manager/modules/ezpcusr.nix
+++ b/home-manager/modules/ezpcusr.nix
@@ -53,7 +53,7 @@ in {
 
       settings = {
         general = {
-          lock_cmd = "noctalia-shell ipc call lockScreen lock";
+          lock_cmd = "noctalia msg session lock";
           before_sleep_cmd = "loginctl lock-session";
           after_sleep_cmd = "hyperctl dispatch dpms on";
         };
@@ -92,7 +92,7 @@ in {
       Install.WantedBy = [config.wayland.systemd.target];
 
       Service = {
-        ExecStart = "${inputs.noctalia.packages.${pkgs.system}.default}/bin/noctalia-shell";
+        ExecStart = "${inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default}/bin/noctalia";
         Restart = "on-failure";
         RestartSec = 5;
       };
@@ -111,7 +111,7 @@ in {
           path = lib.getExe pkgs.xwayland-satellite-unstable;
         };
         # spawn-at-startup = [
-        #   {argv = ["noctalia-shell"];}
+        #   {argv = ["noctalia"];}
         # ];
         clipboard.disable-primary = true;
         input = {
@@ -129,24 +129,24 @@ in {
             # "$mod SHIFT, F, fullscreen, 1"
             # "$mod, Space, togglefloating"
             # "$mod SHIFT, SPACE, exec, hyprctl switchxkblayout all next"
-            "Mod+d".action.spawn = ["noctalia-shell" "ipc" "call" "launcher" "toggle"];
+            "Mod+d".action.spawn = ["noctalia" "msg" "panel-open" "launcher"];
 
             "Print".action.spawn-sh = "grim - | satty -f -";
 
-            "Mod+c".action.spawn = ["noctalia-shell" "ipc" "call" "launcher" "clipboard"];
+            "Mod+c".action.spawn = ["noctalia" "msg" "panel-open" "clipboard"];
 
-            "Mod+Minus".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "decrease"];
-            "Mod+Equal".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "increase"];
-            "XF86AudioLowerVolume".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "decrease"];
-            "XF86AudioRaiseVolume".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "increase"];
+            "Mod+Minus".action.spawn = ["noctalia" "msg" "volume-down"];
+            "Mod+Equal".action.spawn = ["noctalia" "msg" "volume-up"];
+            "XF86AudioLowerVolume".action.spawn = ["noctalia" "msg" "volume-down"];
+            "XF86AudioRaiseVolume".action.spawn = ["noctalia" "msg" "volume-up"];
 
-            "XF86AudioMute".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "mute"];
-            "XF86AudioMicMute".action.spawn = ["noctalia-shell" "ipc" "call" "volume" "muteInput"];
+            "XF86AudioMute".action.spawn = ["noctalia" "msg" "volume-mute"];
+            "XF86AudioMicMute".action.spawn = ["noctalia" "msg" "mic-mute"];
 
-            "XF86MonBrightnessDown".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "decrease"];
-            "XF86MonBrightnessUp".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "increase"];
-            "Mod+Semicolon".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "decrease"];
-            "Mod+Apostrophe".action.spawn = ["noctalia-shell" "ipc" "call" "brightness" "increase"];
+            "XF86MonBrightnessDown".action.spawn = ["noctalia" "msg" "brightness-down"];
+            "XF86MonBrightnessUp".action.spawn = ["noctalia" "msg" "brightness-up"];
+            "Mod+Semicolon".action.spawn = ["noctalia" "msg" "brightness-down"];
+            "Mod+Apostrophe".action.spawn = ["noctalia" "msg" "brightness-up"];
 
             # Previous/next but change the shuffle/random state before action (and change back afterwards)
             "Mod+Shift+Bracketright".action.spawn-sh = "${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl next && ${pkgs.playerctl}/bin/playerctl shuffle Toggle";
@@ -155,23 +155,23 @@ in {
             "Shift+XF86AudioPrev".action.spawn-sh = "${pkgs.playerctl}/bin/playerctl shuffle Toggle && ${pkgs.playerctl}/bin/playerctl pref && ${pkgs.playerctl}/bin/playerctl shuffle Toggle";
 
             # Previous/next
-            "Mod+Bracketright".action.spawn = ["noctalia-shell" "ipc" "call" "media" "next"];
-            "Mod+Bracketleft".action.spawn = ["noctalia-shell" "ipc" "call" "media" "previous"];
-            "XF86AudioNext".action.spawn = ["noctalia-shell" "ipc" "call" "media" "next"];
-            "XF86AudioPrev".action.spawn = ["noctalia-shell" "ipc" "call" "media" "previous"];
+            "Mod+Bracketright".action.spawn = ["noctalia" "msg" "media" "next"];
+            "Mod+Bracketleft".action.spawn = ["noctalia" "msg" "media" "previous"];
+            "XF86AudioNext".action.spawn = ["noctalia" "msg" "media" "next"];
+            "XF86AudioPrev".action.spawn = ["noctalia" "msg" "media" "previous"];
 
             # Seek forward/back
-            "Mod+Control+bracketleft".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "-5"];
-            "Mod+Control+bracketright".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "5"];
-            "Control+XF86AudioPrev".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "-5"];
-            "Control+XF86AudioNext".action.spawn = ["noctalia-shell" "ipc" "call" "media" "seekRelative" "5"];
+            "Mod+Control+bracketleft".action.spawn = ["noctalia" "msg" "media" "seekRelative" "-5"];
+            "Mod+Control+bracketright".action.spawn = ["noctalia" "msg" "media" "seekRelative" "5"];
+            "Control+XF86AudioPrev".action.spawn = ["noctalia" "msg" "media" "seekRelative" "-5"];
+            "Control+XF86AudioNext".action.spawn = ["noctalia" "msg" "media" "seekRelative" "5"];
 
             # Toggle play/pause
-            "XF86AudioPlay".action.spawn = ["noctalia-shell" "ipc" "call" "media" "playPause"];
-            "XF86AudioPause".action.spawn = ["noctalia-shell" "ipc" "call" "media" "playPause"];
-            "Mod+Backslash".action.spawn = ["noctalia-shell" "ipc" "call" "media" "playPause"];
+            "XF86AudioPlay".action.spawn = ["noctalia" "msg" "media" "toggle"];
+            "XF86AudioPause".action.spawn = ["noctalia" "msg" "media" "toggle"];
+            "Mod+Backslash".action.spawn = ["noctalia" "msg" "media" "toggle"];
 
-            "Control+Alt+l".action.spawn = ["noctalia-shell" "ipc" "call" "lockScreen" "lock"];
+            "Control+Alt+l".action.spawn = ["noctalia" "msg" "session" "lock"];
 
             "Mod+Shift+Slash".action = config.lib.niri.actions.show-hotkey-overlay;
 
@@ -260,7 +260,7 @@ in {
       };
     };
 
-    programs.noctalia-shell = {
+    programs.noctalia= {
       enable = true;
       settings = {
         appLauncher = {
@@ -385,11 +385,11 @@ in {
       keyutils
       maim
       slop
-      xorg.xhost
+      xhost
       sway-contrib.grimshot
       grim
 
-      inputs.noctalia.packages.${pkgs.system}.default
+      inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default
     ];
 
     programs.satty = {
diff --git a/home-manager/users/notgne2.nix b/home-manager/users/notgne2.nix
index 63e1d93..e403f84 100644
--- a/home-manager/users/notgne2.nix
+++ b/home-manager/users/notgne2.nix
@@ -78,7 +78,7 @@ in {
         withPython3 = true;
         plugins = with pkgs.vimPlugins; [
           direnv-vim
-          fugitive
+          vim-fugitive
           vim-nix
           camelcasemotion
           vim-indent-object
@@ -144,17 +144,23 @@ in {
         };
         enable = true;
         lfs.enable = true;
-        userName = "notgne2";
-        userEmail = "gen2@gen2.space";
         ignores = [".envrc"];
-        extraConfig.push.autoSetupRemote = true;
+        settings = {
+          user = {
+            email = "gen2@gen2.space";
+            name = "notgne2";
+          };
+
+          push.autoSetupRemote = true;
+        };
       };
     }
     // (lib.optionalAttrs (options.programs ? nixcord) {
       nixcord = {
-        package = pkgs.vencord;
-
-        discord.enable = false;
+        discord = {
+          enable = false;
+          package = pkgs.vencord;
+        };
 
         vesktop = {
           enable = true;