5 files changed, 100 insertions, 69 deletions
diff --git a/home/rices/plasma6/default.nix b/home/rices/plasma6/default.nix
index d363548..6b7865d 100644
--- a/home/rices/plasma6/default.nix
+++ b/home/rices/plasma6/default.nix
@@ -1,6 +1,4 @@
-{...}: {
-  imports = [
-    ./stylix.nix
-    ./plasma.nix
-  ];
+{
+  system = import ./system.nix;
+  home = import ./home.nix;
 }
diff --git a/home/rices/plasma6/home.nix b/home/rices/plasma6/home.nix
new file mode 100644
index 0000000..0dd85ad
--- /dev/null
+++ b/home/rices/plasma6/home.nix
@@ -0,0 +1,4 @@
+{...}: {
+  # Plasma-specific HM configs can go here
+  # For now, minimal/empty
+}
diff --git a/home/rices/plasma6/plasma.nix b/home/rices/plasma6/plasma.nix
deleted file mode 100644
index 44270a8..0000000
--- a/home/rices/plasma6/plasma.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{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/plasma6/stylix.nix b/home/rices/plasma6/stylix.nix
deleted file mode 100644
index 1c89567..0000000
--- a/home/rices/plasma6/stylix.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{pkgs, ...}: let
-  vars = import ./variables.nix;
-in {
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/espresso.yaml";
-    polarity = "dark";
-
-    image = vars.image;
-
-    fonts = {
-      serif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Serif";
-      };
-
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
-
-      monospace = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans Mono";
-      };
-
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-    };
-  };
-}
diff --git a/home/rices/plasma6/system.nix b/home/rices/plasma6/system.nix
new file mode 100644
index 0000000..f195684
--- /dev/null
+++ b/home/rices/plasma6/system.nix
@@ -0,0 +1,93 @@
+{pkgs, ...}: let
+  vars = import ./variables.nix;
+in {
+  # Enable Plasma 6 desktop (ly display manager is enabled in system/services.nix)
+  services.desktopManager.plasma6.enable = true;
+
+  # X11 configuration
+  services.xserver = {
+    enable = true;
+    xkb = {
+      layout = "cz";
+      options = "eurosign:e,caps:escape";
+    };
+  };
+
+  # Exclude unwanted KDE packages
+  environment.plasma6.excludePackages = with pkgs.kdePackages; [
+    elisa # Music player
+    kdepim-runtime # Akonadi agents
+    kmahjongg
+    kmines
+    konversation # IRC client
+    kpat # Solitaire
+    ksudoku
+    ktorrent
+  ];
+
+  # KDE utilities and system packages
+  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
+    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
+  ];
+
+  # Stylix theming
+  stylix = {
+    enable = true;
+    autoEnable = true;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/espresso.yaml";
+    image = vars.image;
+
+    fonts = {
+      monospace = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans Mono";
+      };
+      sansSerif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Sans";
+      };
+      serif = {
+        package = pkgs.dejavu_fonts;
+        name = "DejaVu Serif";
+      };
+      emoji = {
+        package = pkgs.noto-fonts-color-emoji;
+        name = "Noto Color Emoji";
+      };
+      sizes = {
+        terminal = 11;
+        applications = 11;
+        desktop = 11;
+      };
+    };
+
+    cursor = {
+      package = pkgs.bibata-cursors;
+      name = "Bibata-Modern-Classic";
+      size = 24;
+    };
+
+    opacity = {
+      terminal = 0.95;
+      applications = 1.0;
+      desktop = 1.0;
+      popups = 0.95;
+    };
+
+    polarity = "dark";
+    targets.nixos-icons.enable = false;
+  };
+}