diff --git a/roles/kde/plasma.nix b/roles/kde/plasma.nix
index cbe8ff5..ca29d2e 100644
--- a/roles/kde/plasma.nix
+++ b/roles/kde/plasma.nix
@@ -46,17 +46,7 @@ in {
           kFinal: kPrev: {
             libplasma = kPrev.libplasma.overrideAttrs {
               patches = [
-                ../kde/patches/libplasma-pr1214.patch
-              ];
-            };
-            kwin = kPrev.kwin.overrideAttrs {
-              patches = kPrev.kwin.patches ++ [
-                ../kde/patches/kwin-pr6406.patch
-              ];
-            };
-            konsole = kPrev.konsole.overrideAttrs {
-              patches = [
-                ../kde/patches/konsole-pr767.patch
+                ./patches/libplasma-pr1214.patch
               ];
             };
           }
@@ -98,16 +88,6 @@ in {
           theme = "default";
           colorScheme = "CatppuccinMochaMauve";
         };
-        kwin = {
-          titlebarButtons = {
-            left = ["on-all-desktops" "keep-above-windows"];
-            right = ["minimize" "maximize" "close"];
-          };
-          virtualDesktops = {
-            rows = 1;
-            number = 2;
-          };
-        };
         input = {
           keyboard = {
             layouts = [{layout = "es";}];
@@ -138,17 +118,7 @@ in {
             ];
           }
         ];
-        shortcuts = {
-          "kwin" = {
-            "Switch One Desktop to the Left" = ["Meta+Ctrl+Left"];
-            "Switch One Desktop to the Right" = ["Meta+Ctrl+Right"];
-          };
-        };
         configFile = {
-          "kwinrc" = {
-            "org.kde.kdecoration2"."BorderSize".value = "None";
-            "TabBox"."LayoutName".value = "thumbnail_grid";
-          };
           "kdeglobals"."General"."AccentColor".value = null;
           "auroraerc"."CatppuccinMocha-Classic"."ButtonSize".value = 0;
           "plasmanotifyrc"."Notifications"."NormalAlwaysOnTop".value = true;
diff --git a/roles/kde/programs/default.nix b/roles/kde/programs/default.nix
index 36f0eab..fe160e8 100644
--- a/roles/kde/programs/default.nix
+++ b/roles/kde/programs/default.nix
@@ -7,6 +7,7 @@
     # ./neochat.nix
     ./konsole.nix
     ./git.nix
+    ./kwin.nix
   ];
 
   # Enable the kde partition manager
diff --git a/roles/kde/programs/konsole.nix b/roles/kde/programs/konsole.nix
index 407e2ad..6bf8ae8 100644
--- a/roles/kde/programs/konsole.nix
+++ b/roles/kde/programs/konsole.nix
@@ -24,4 +24,19 @@ in {
       };
     };
   };
+  nixpkgs.overlays = [
+    (
+      final: prev: {
+        kdePackages = prev.kdePackages.overrideScope (
+          kFinal: kPrev: {
+            konsole = kPrev.konsole.overrideAttrs {
+              patches = [
+                ../patches/konsole-pr767.patch
+              ];
+            };
+          }
+        );
+      }
+    )
+  ];
 }
diff --git a/roles/kde/programs/kwin.nix b/roles/kde/programs/kwin.nix
new file mode 100644
index 0000000..0dfddbb
--- /dev/null
+++ b/roles/kde/programs/kwin.nix
@@ -0,0 +1,45 @@
+{...}: {
+  nixpkgs.overlays = [
+    (
+      final: prev: {
+        kdePackages = prev.kdePackages.overrideScope (
+          kFinal: kPrev: {
+            kwin = kPrev.kwin.overrideAttrs {
+              patches =
+                kPrev.kwin.patches
+                ++ [
+                  ./patches/kwin-pr6406.patch
+                ];
+            };
+          }
+        );
+      }
+    )
+  ];
+  home-manager.users.toast = {
+    programs.plasma = {
+      kwin = {
+        titlebarButtons = {
+          left = ["on-all-desktops" "keep-above-windows"];
+          right = ["minimize" "maximize" "close"];
+        };
+        virtualDesktops = {
+          rows = 1;
+          number = 2;
+        };
+      };
+      configFile = {
+        "kwinrc" = {
+          "org.kde.kdecoration2"."BorderSize".value = "None";
+          "TabBox"."LayoutName".value = "thumbnail_grid";
+        };
+      };
+      shortcuts = {
+        "kwin" = {
+          "Switch One Desktop to the Left" = ["Meta+Ctrl+Left"];
+          "Switch One Desktop to the Right" = ["Meta+Ctrl+Right"];
+        };
+      };
+    };
+  };
+}