roles/kde/plasma.nix

@@ -46,7 +46,17 @@ in {
           kFinal: kPrev: {
             libplasma = kPrev.libplasma.overrideAttrs {
               patches = [
-                ./patches/libplasma-pr1214.patch
+                ../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
               ];
             };
           }
@@ -88,6 +98,16 @@ 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";}];
@@ -118,7 +138,17 @@ 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;

roles/kde/programs/default.nix

@@ -1,4 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   imports = [
     ./kate.nix
     ./firefox.nix
@@ -7,10 +7,8 @@
     # ./neochat.nix
     ./konsole.nix
     ./git.nix
-    ./kwin.nix
   ];
 
   # Enable the kde partition manager
   programs.partition-manager.enable = true;
-  programs.steam.extraPackages = [pkgs.kdePackages.breeze];
 }

roles/kde/programs/konsole.nix

@@ -24,19 +24,4 @@ in {
       };
     };
   };
-  nixpkgs.overlays = [
-    (
-      final: prev: {
-        kdePackages = prev.kdePackages.overrideScope (
-          kFinal: kPrev: {
-            konsole = kPrev.konsole.overrideAttrs {
-              patches = [
-                ../patches/konsole-pr767.patch
-              ];
-            };
-          }
-        );
-      }
-    )
-  ];
 }

roles/kde/programs/kwin.nix

@@ -1,45 +0,0 @@
-{...}: {
-  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"];
-        };
-      };
-    };
-  };
-}