Merge branch 'herra_cosmic-to-plasma6'

6 files changed, 37 insertions, 26 deletions

diff --git a/home/rices/cosmic/default.nix b/home/rices/cosmic/default.nix
deleted file mode 100644
index 3c8592a..0000000
--- a/home/rices/cosmic/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{pkgs, ...}: {
-  imports = [
-    fluxbox.nix
-  ];
-
-  home.packages = with pkgs; [
-  ];
-}
diff --git a/home/rices/cosmic/fluxbox.nix b/home/rices/cosmic/fluxbox.nix
deleted file mode 100644
index af00a1d..0000000
--- a/home/rices/cosmic/fluxbox.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{pkgs, ...}: {
-  # Enable cosmix as the DE
-  services.desktopManager.cosmic = {
-    enable = true;
-  };
-  # Exclude packages
-  environment.cosmic.excludePackages = with pkgs; [
-    cosmic-edit
-  ];
-
-  # Slightly improve performance by enabling system76's own scheduler
-  services.system76-scheduler.enable = true;
-
-  programs.firefox.preferences = {
-    # disable libadwaita theming for Firefox
-    "widget.gtk.libadwaita-colors.enabled" = false;
-  };
-}
diff --git a/home/rices/plasma6/default.nix b/home/rices/plasma6/default.nix
new file mode 100644
index 0000000..d363548
--- /dev/null
+++ b/home/rices/plasma6/default.nix
@@ -0,0 +1,6 @@
+{...}: {
+  imports = [
+    ./stylix.nix
+    ./plasma.nix
+  ];
+}
diff --git a/home/rices/plasma6/plasma.nix b/home/rices/plasma6/plasma.nix
new file mode 100644
index 0000000..44270a8
--- /dev/null
+++ b/home/rices/plasma6/plasma.nix
@@ -0,0 +1,31 @@
+{pkgs, ...}: {
+  services.desktopManager.plasma6.enable = true;
+
+  environment.plasma6.excludePackages = with pkgs; [
+    kdePackages.elisa # Music player
+    kdePackages.kdepim-runtime # Akonadi agents
+    kdePackages.kmahjongg
+    kdePackages.kmines
+    kdePackages.konversation # IRC client
+    kdePackages.kpat # Solitaire
+    kdePackages.ksudoku
+    kdePackages.ktorrent
+  ];
+
+  environment.systemPackages = with pkgs; [
+    # KDE Utilities
+    kdePackages.kcalc # Calculator
+    kdePackages.kcharselect # Character map
+    kdePackages.kclock # Clock app
+    kdePackages.kcolorchooser # Color picker
+    kdePackages.ksystemlog # System log viewer
+    kdiff3 # File/directory comparison tool
+
+    # Hardware/System Utilities (Optional)
+    kdePackages.isoimagewriter # Write hybrid ISOs to USB
+    kdePackages.partitionmanager # Disk and partition management
+    hardinfo2 # System benchmarks and hardware info
+    wayland-utils # Wayland diagnostic tools
+    wl-clipboard # Wayland copy/paste support
+  ];
+}
diff --git a/home/rices/cosmic/stylix.nix b/home/rices/plasma6/stylix.nix
index 1c89567..1c89567 100644
--- a/home/rices/cosmic/stylix.nix
+++ b/home/rices/plasma6/stylix.nix
diff --git a/home/rices/cosmic/variables.nix b/home/rices/plasma6/variables.nix
index 4c13af7..4c13af7 100644
--- a/home/rices/cosmic/variables.nix
+++ b/home/rices/plasma6/variables.nix