seth/desktop: update to plasma 6

3 files changed, 60 insertions, 34 deletions

diff --git a/users/seth/module/desktop/default.nix b/users/seth/module/desktop/default.nix
index a0da485..d7b5176 100644
--- a/users/seth/module/desktop/default.nix
+++ b/users/seth/module/desktop/default.nix
@@ -19,6 +19,7 @@ in {
     ./budgie
     ./gnome
     ./plasma
+    ./plasma5
   ];
 
   config = lib.mkIf cfg.enable {
diff --git a/users/seth/module/desktop/plasma/default.nix b/users/seth/module/desktop/plasma/default.nix
index e3735f1..bcff9f5 100644
--- a/users/seth/module/desktop/plasma/default.nix
+++ b/users/seth/module/desktop/plasma/default.nix
@@ -1,38 +1,17 @@
 {
-  config,
   lib,
   pkgs,
   osConfig,
   ...
 }: let
-  enable = osConfig.services.xserver.desktopManager.plasma5.enable or false;
-  themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
+  enable = osConfig.services.xserver.desktopManager.plasma6.enable or false;
 in {
   config = lib.mkIf enable {
     home.packages = with pkgs; [
-      catppuccin-cursors
-      (catppuccin-kde.override
-        {
-          flavour = ["mocha"];
-          accents = ["mauve"];
-        })
-
-      (catppuccin-kvantum.override
-        {
-          variant = "Mocha";
-          accent = "Mauve";
-        })
-
-      libsForQt5.qtstyleplugin-kvantum
       papirus-icon-theme
     ];
 
     xdg = {
-      configFile = {
-        "gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css";
-        "gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css";
-      };
-
       dataFile."konsole/catppuccin-mocha.colorscheme".source =
         pkgs.fetchFromGitHub {
           owner = "catppuccin";
@@ -42,17 +21,5 @@ in {
         }
         + "/Catppuccin-Mocha.colorscheme";
     };
-
-    gtk = {
-      enable = true;
-
-      theme = {
-        name = "Catppuccin-Mocha-Standard-Mauve-dark";
-        package = pkgs.catppuccin-gtk.override {
-          accents = ["mauve"];
-          variant = "mocha";
-        };
-      };
-    };
   };
 }
diff --git a/users/seth/module/desktop/plasma5/default.nix b/users/seth/module/desktop/plasma5/default.nix
new file mode 100644
index 0000000..e3735f1
--- /dev/null
+++ b/users/seth/module/desktop/plasma5/default.nix
@@ -0,0 +1,58 @@
+{
+  config,
+  lib,
+  pkgs,
+  osConfig,
+  ...
+}: let
+  enable = osConfig.services.xserver.desktopManager.plasma5.enable or false;
+  themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}";
+in {
+  config = lib.mkIf enable {
+    home.packages = with pkgs; [
+      catppuccin-cursors
+      (catppuccin-kde.override
+        {
+          flavour = ["mocha"];
+          accents = ["mauve"];
+        })
+
+      (catppuccin-kvantum.override
+        {
+          variant = "Mocha";
+          accent = "Mauve";
+        })
+
+      libsForQt5.qtstyleplugin-kvantum
+      papirus-icon-theme
+    ];
+
+    xdg = {
+      configFile = {
+        "gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css";
+        "gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css";
+      };
+
+      dataFile."konsole/catppuccin-mocha.colorscheme".source =
+        pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "konsole";
+          rev = "7d86b8a1e56e58f6b5649cdaac543a573ac194ca";
+          sha256 = "EwSJMTxnaj2UlNJm1t6znnatfzgm1awIQQUF3VPfCTM=";
+        }
+        + "/Catppuccin-Mocha.colorscheme";
+    };
+
+    gtk = {
+      enable = true;
+
+      theme = {
+        name = "Catppuccin-Mocha-Standard-Mauve-dark";
+        package = pkgs.catppuccin-gtk.override {
+          accents = ["mauve"];
+          variant = "mocha";
+        };
+      };
+    };
+  };
+}