more plasma updates

flakes/de_plasma/de_plasma.nix

@@ -24,24 +24,6 @@ let
         cfg.gpu.intel.enable or false
       ]
     )) <= 1;
-  panelDefaults = {
-    enabled = true;
-    location = "top";
-    height = 24;
-    opacity = "translucent"; # "adaptive" | "translucent" | "opaque"
-    widgets = [
-      "org.kde.plasma.kickoff"
-      "org.kde.plasma.icontasks"
-      "org.kde.plasma.systemtray"
-      "org.kde.plasma.networkmanagement"
-      "org.kde.plasma.bluetooth"
-      "org.kde.plasma.volume"
-      "org.kde.plasma.battery"
-      "org.kde.plasma.powerprofiles"
-      "org.kde.plasma.notifications"
-      "org.kde.plasma.digitalclock"
-    ];
-  };
 in
 {
   options.ringofstorms.dePlasma = {
@@ -117,37 +99,11 @@ in
       };
     };
 
-    panel = {
+    # TODO how to use same type as home manager programs.plasma.panels.*
-      enabled = mkOption {
+    # panels = mkOption {
-        type = types.bool;
+    #     type = types.listOf types.;
-        default = panelDefaults.enabled;
+    #     default = [ defaultPanel ];
-      };
+    # };
-      location = mkOption {
-        type = types.enum [
-          "top"
-          "bottom"
-          "left"
-          "right"
-        ];
-        default = panelDefaults.location;
-      };
-      height = mkOption {
-        type = types.int;
-        default = panelDefaults.height;
-      };
-      opacity = mkOption {
-        type = types.enum [
-          "adaptive"
-          "translucent"
-          "opaque"
-        ];
-        default = panelDefaults.opacity;
-      };
-      widgets = mkOption {
-        type = types.listOf types.str;
-        default = panelDefaults.widgets;
-      };
-    };
 
     shortcuts = {
       terminal = mkOption {
@@ -225,11 +181,11 @@ in
         kdePackages.plasma-browser-integration
         kdePackages.plasma-workspace-wallpapers
         # Panel applets required for widgets
-        kdePackages.plasma-nm        # org.kde.plasma.networkmanagement
+        kdePackages.plasma-nm # org.kde.plasma.networkmanagement
-        kdePackages.bluedevil        # org.kde.plasma.bluetooth
+        kdePackages.bluedevil # org.kde.plasma.bluetooth
-        kdePackages.plasma-pa        # org.kde.plasma.volume
+        kdePackages.plasma-pa # org.kde.plasma.volume
         kdePackages.kdeplasma-addons # extra widgets
-        kdePackages.powerdevil       # power management services
+        kdePackages.powerdevil # power management services
       ];
     };
   };

flakes/de_plasma/home_manager/panel.nix

@@ -6,23 +6,36 @@
 let
   cfg = osConfig.ringofstorms.dePlasma;
   inherit (lib) mkIf;
-  mkPanel =
+
-    {
+  defaultPanel = {
-      location ? cfg.panel.location,
+    location = "top";
-      height ? cfg.panel.height,
+    height = 24;
-      opacity ? cfg.panel.opacity,
+    opacity = "translucent"; # "adaptive" | "translucent" | "opaque"
-      widgets ? cfg.panel.widgets,
+    floating = true;
-    }:
+    hiding = "dodgewindows";
-    {
+    lengthMode = "fill";
-      location = location;
+    widgets = [
-      height = height;
+      "org.kde.plasma.kickoff"
-      opacity = opacity;
+      "org.kde.plasma.pager"
-      widgets = widgets;
+      "org.kde.plasma.icontasks"
-    };
+      #
+      "org.kde.plasma.marginsseparator"
+      #
+      "org.kde.plasma.systemtray"
+      "org.kde.plasma.networkmanagement"
+      "org.kde.plasma.bluetooth"
+      "org.kde.plasma.volume"
+      "org.kde.plasma.battery"
+      "org.kde.plasma.powerprofiles"
+      "org.kde.plasma.notifications"
+      "org.kde.plasma.digitalclock"
+      "org.kde.plasma.showdesktop"
+    ];
+  };
 in
 {
   options = { };
-  config = mkIf (cfg.enable && cfg.panel.enabled) {
+  config = mkIf cfg.enable {
-    programs.plasma.panels = [ (mkPanel { }) ];
+    programs.plasma.panels = [ defaultPanel ];
   };
 }