plasma wip

flakes/de_plasma/home_manager/panel.nix

@@ -5,7 +5,7 @@
 }:
 let
   cfg = osConfig.ringofstorms.dePlasma;
-  inherit (lib) mkIf;
+  inherit (lib) mkIf mkDefault;
 
   defaultPanel = {
     location = "top";
@@ -36,6 +36,6 @@ in
 {
   options = { };
   config = mkIf cfg.enable {
-    programs.plasma.panels = [ defaultPanel ];
+    programs.plasma.panels = mkDefault [ defaultPanel ];
   };
 }

flakes/de_plasma/home_manager/plasma.nix

@@ -1,4 +1,4 @@
-{ osConfig, lib, pkgs, ... }:
+{ osConfig, lib, ... }:
 let
   cfg = osConfig.ringofstorms.dePlasma;
   inherit (lib) mkIf;
@@ -6,10 +6,8 @@ in
 {
   options = {};
   config = mkIf cfg.enable {
-    # plasma-manager base enable
     programs.plasma = {
       enable = true;
-      # Tweak some global Plasma config if desired later
     };
   };
 }

flakes/de_plasma/home_manager/shortcuts.nix

@@ -1,7 +1,5 @@
-{ osConfig, lib, ... }:
+{ ... }:
 let
-  cfg = osConfig.ringofstorms.dePlasma;
-  inherit (lib) mkIf;
   workspaces = builtins.genList (i: i + 1) 9;
   kwinWorkspace = builtins.listToAttrs (
     map (i: {
@@ -15,42 +13,22 @@ let
       value = "Meta+Shift+${toString i}";
     }) workspaces
   );
-  krunnerShortcut =
-    if cfg.shortcuts.launcher == "krunner" then
-      {
-        krunner = {
-          "Run Command" = "Meta+Space";
-        };
-      }
-    else
-      { };
 in
 {
   options = { };
-  config = mkIf (cfg.enable && cfg.shortcuts.useI3Like) {
-    programs.plasma.shortcuts = (
-      {
-        kwin = ({ "Close Window" = cfg.shortcuts.closeWindow; } // kwinWorkspace // kwinMoveWorkspace);
-      }
-      // krunnerShortcut
-    );
+  config = {
+    programs.plasma.shortcuts = ({
+      kwin = ({ "Close Window" = "Meta+Q"; } // kwinWorkspace // kwinMoveWorkspace);
+      krunner = {
+        "Run Command" = "Meta+Space";
+      };
+    });
 
     programs.plasma.hotkeys.commands = {
       ringofstorms-terminal = {
         key = "Meta+Return";
-        command = cfg.shortcuts.terminal;
+        command = "foot"; # TODO configurable?
       };
-    }
-    // (
-      if cfg.shortcuts.launcher == "rofi" then
-        {
-          ringofstorms-launcher = {
-            key = "Meta+Space";
-            command = "rofi -show drun";
-          };
-        }
-      else
-        { }
-    );
+    };
   };
 }

flakes/de_plasma/home_manager/theme.nix

@@ -16,8 +16,6 @@ in
         lookAndFeel = "org.kde.breezedark.desktop";
         cursor.theme = "breeze_cursors";
       };
-      fonts = { }; # keep defaults
-      kscreenlocker = { }; # swaylock analog not applicable; left default
     };
   };
 }