diff --git a/flake.lock b/flake.lock
index 02e25cf..2046a49 100644
--- a/flake.lock
+++ b/flake.lock
@@ -339,15 +339,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1712484920,
-        "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=",
-        "owner": "pjones",
+        "lastModified": 1712872911,
+        "narHash": "sha256-gwYrKMXuUBf5acvTzH7+lXeBbBZYUUEgcLBugHXimuc=",
+        "owner": "toast003",
         "repo": "plasma-manager",
-        "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3",
+        "rev": "8a3ac8690d6f546ec9185e1f5ddbb1f76d63b6b1",
         "type": "github"
       },
       "original": {
-        "owner": "pjones",
+        "owner": "toast003",
+        "ref": "libinput",
         "repo": "plasma-manager",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 90defdb..a47a42f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,7 +51,7 @@
     };
 
     plasma-manager = {
-      url = "github:pjones/plasma-manager";
+      url = "github:toast003/plasma-manager/libinput";
       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 664adc3..f3a64c1 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -110,19 +110,22 @@
   environment.sessionVariables = {
     STEAM_FORCE_DESKTOPUI_SCALING = "2";
   };
-  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";
+  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";
+        };
       };
-    };
-  };
+      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 365dc9e..b88ff52 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -125,6 +125,16 @@ in {
             left = ["on-all-desktops" "keep-above-windows"];
             right = ["minimize" "maximize" "close"];
           };
+          virtualDesktops = {
+            rows = 1;
+            number = 2;
+          };
+        };
+        input = {
+          keyboard = {
+            layouts = ["es"];
+            numlockOnStartup = "off";
+          };
         };
         panels = [
           {
@@ -156,10 +166,6 @@ 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;