diff --git a/flake.lock b/flake.lock
index 2046a49..02e25cf 100644
--- a/flake.lock
+++ b/flake.lock
@@ -339,16 +339,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1712872911,
-        "narHash": "sha256-gwYrKMXuUBf5acvTzH7+lXeBbBZYUUEgcLBugHXimuc=",
-        "owner": "toast003",
+        "lastModified": 1712484920,
+        "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=",
+        "owner": "pjones",
         "repo": "plasma-manager",
-        "rev": "8a3ac8690d6f546ec9185e1f5ddbb1f76d63b6b1",
+        "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3",
         "type": "github"
       },
       "original": {
-        "owner": "toast003",
-        "ref": "libinput",
+        "owner": "pjones",
         "repo": "plasma-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index a47a42f..90defdb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,7 +51,7 @@
     };
 
     plasma-manager = {
-      url = "github:toast003/plasma-manager/libinput";
+      url = "github:pjones/plasma-manager";
       inputs.nixpkgs.follows = "nixpkgs-unstable-raw";
       inputs.home-manager.follows = "home-manager-unstable";
     };
diff --git a/machines/WinMax2/configuration.nix b/machines/WinMax2/configuration.nix
index f3a64c1..664adc3 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -110,22 +110,19 @@
   environment.sessionVariables = {
     STEAM_FORCE_DESKTOPUI_SCALING = "2";
   };
-  home-manager.sharedModules = [
-    {
-      # Steam's hidpi support is bugged so it needds to be hardcoded
-      # This bypasses that
-      xdg.desktopEntries = {
-        steam-noScaling = {
-          name = "Steam (No Scaling)";
-          exec = "env STEAM_FORCE_DESKTOPUI_SCALING=0 steam %U";
-          icon = "steam";
-          categories = ["Network" "FileTransfer" "Game"];
-          comment = "Application for managing and playing games on Steam";
-        };
+  home-manager.users.toast = {
+    # Steam's hidpi support is bugged so it needds to be hardcoded
+    # This bypasses that
+    xdg.desktopEntries = {
+      steam-noScaling = {
+        name = "Steam (No Scaling)";
+        exec = "env STEAM_FORCE_DESKTOPUI_SCALING=0 steam %U";
+        icon = "steam";
+        categories = ["Network" "FileTransfer" "Game"];
+        comment = "Application for managing and playing games on Steam";
       };
-      programs.plasma.input.keyboard.layouts = lib.mkForce [ "us" ];
-    }
-  ];
+    };
+  };
 
   # Enable sound.
   # sound.enable = true;
diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index b88ff52..365dc9e 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -125,16 +125,6 @@ in {
             left = ["on-all-desktops" "keep-above-windows"];
             right = ["minimize" "maximize" "close"];
           };
-          virtualDesktops = {
-            rows = 1;
-            number = 2;
-          };
-        };
-        input = {
-          keyboard = {
-            layouts = ["es"];
-            numlockOnStartup = "off";
-          };
         };
         panels = [
           {
@@ -166,6 +156,10 @@ in {
         configFile = {
           "kwinrc" = {
             "org.kde.kdecoration2"."BorderSize".value = "None";
+            "Desktops" = {
+              "Number".value = 2;
+              "Rows".value = 1;
+            };
             "TabBox"."LayoutName".value = "thumbnail_grid";
           };
           "kdeglobals"."General"."AccentColor".value = null;