From 5e271ae4a560811373cc07dfda50812d048d5c4d Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Mon, 29 Apr 2024 13:33:30 +0200
Subject: [PATCH 1/3] Revert "Revert switching to my branch of plasma manager"

This reverts commit 8699442aba3ceb11515afb571d7c9a04cf8b2c5f.
---
 flake.lock                         | 13 +++++++------
 flake.nix                          |  2 +-
 machines/WinMax2/configuration.nix |  1 +
 roles/kde/plasma.nix               |  6 ++++++
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index 4cfe813..163f32b 100644
--- a/flake.lock
+++ b/flake.lock
@@ -353,15 +353,16 @@
         ]
       },
       "locked": {
-        "lastModified": 1712484920,
-        "narHash": "sha256-wNwv12U/QYYgZanycZ32A41cEDa2zPwYuMKK6AJYNJk=",
-        "owner": "pjones",
+        "lastModified": 1713952910,
+        "narHash": "sha256-7ICgAfFSQXZlWyhfSrGXAS0rg2YSMKqEO+4EF4lH25I=",
+        "owner": "toast003",
         "repo": "plasma-manager",
-        "rev": "4b127a5ede004f5c6d7c41938c2986b599dc0bf3",
+        "rev": "13c65048f1f527c7d4ee1f921fa1847129139385",
         "type": "github"
       },
       "original": {
-        "owner": "pjones",
+        "owner": "toast003",
+        "ref": "libinput",
         "repo": "plasma-manager",
         "type": "github"
       }
@@ -458,4 +459,4 @@
   },
   "root": "root",
   "version": 7
-}
\ No newline at end of file
+}
diff --git a/flake.nix b/flake.nix
index 9f65afb..524a6a9 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 fd5f9ea..65f51ff 100755
--- a/machines/WinMax2/configuration.nix
+++ b/machines/WinMax2/configuration.nix
@@ -114,6 +114,7 @@
           comment = "Application for managing and playing games on Steam";
         };
       };
+      programs.plasma.input.keyboard.layouts = lib.mkForce ["us"];
     }
   ];
 
diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index 2d135ad..e382060 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -132,6 +132,12 @@ in {
             number = 2;
           };
         };
+        input = {
+          keyboard = {
+            layouts = ["es"];
+            numlockOnStartup = "off";
+          };
+        };
         panels = [
           {
             location = "bottom";

From f02f907932e93f0465db6178db9cc97d2e3fdf5a Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Mon, 29 Apr 2024 13:45:20 +0200
Subject: [PATCH 2/3] Flake: update plasma-manager

---
 flake.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 163f32b..bc170ef 100644
--- a/flake.lock
+++ b/flake.lock
@@ -353,11 +353,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713952910,
-        "narHash": "sha256-7ICgAfFSQXZlWyhfSrGXAS0rg2YSMKqEO+4EF4lH25I=",
+        "lastModified": 1714390161,
+        "narHash": "sha256-hWPGLUGNr7IR2FT4xS0VlhTW3S6xpw0hU3LJJC3CaKo=",
         "owner": "toast003",
         "repo": "plasma-manager",
-        "rev": "13c65048f1f527c7d4ee1f921fa1847129139385",
+        "rev": "d9754f6f5dcf96969ad40496326213d5344846e5",
         "type": "github"
       },
       "original": {

From 760a3d3b2a9e8916c5f23cb17704cc4e223a0ad8 Mon Sep 17 00:00:00 2001
From: Toast <toast003@tutamail.com>
Date: Mon, 29 Apr 2024 13:45:32 +0200
Subject: [PATCH 3/3] Kde/plasma: don't override config

---
 roles/kde/plasma.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index e382060..f7052e8 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -108,12 +108,6 @@ in {
       ];
       programs.plasma = {
         enable = true;
-        overrideConfig = true;
-        # Delete config files that I fully configure here
-        overrideConfigFiles = [
-          "plasmashellrc"
-          "plasma-org.kde.plasma.desktop-appletsrc"
-        ];
         workspace = {
           clickItemTo = "select";
           cursorTheme = "Breeze_Snow";