Optimize

nix-community · Dec 3, 2024 · 36d5f5c · 36d5f5c
1 parent a75a88f
commit 36d5f5c
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/modules/scripts/tiling/krohnkite.nix b/modules/scripts/tiling/krohnkite.nix
@@ -73,8 +73,13 @@ let
       description = description;
     };
 
-  getLayoutSetting =
-    layout: key:
+  findLayoutSetting =
+    name: key:
+    let
+      layout = lib.findFirst (
+        layout: layout.name == name
+      ) cfg.kwin.scripts.krohnkite.settings.layouts.enabled;
+    in
     lib.getAttrFromPath [
       "options"
       key
@@ -83,6 +88,23 @@ let
 
   isLayoutEnabled =
     name: lib.any (layout: layout.name == name) cfg.kwin.scripts.krohnkite.settings.layouts.enabled;
+
+  serializeLayouts =
+    layouts:
+    let
+      toLayoutEntry =
+        layout:
+        {
+          "enable${lib.capitalize layout}" = isLayoutEnabled layout;
+        }
+        // (
+          if isLayoutEnabled layout then
+            lib.getAttrFromPath [ "options" ] (lib.findFirst (l: l.name == layout) layouts) // { }
+          else
+            { }
+        );
+    in
+    lib.foldl' lib.recursiveUpdate { } (lib.map toLayoutEntry krohnkiteSupportedLayouts);
 in
 {
   options.programs.plasma.kwin.scripts.krohnkite = with lib.types; {
@@ -145,10 +167,9 @@ in
       Script-krohnkite =
         let
           gaps = cfg.kwin.scripts.krohnkite.settings.gaps;
-          layouts = cfg.kwin.scripts.krohnkite.settings.layouts.enabled;
-          findLayout = name: lib.findFirst (layout: layout.name == name) layouts;
         in
-        {
+        serializeLayouts cfg.kwin.scripts.krohnkite.settings.layouts.enabled
+        // {
           screenGapTop = gaps.top;
           screenGapLeft = gaps.left;
           screenGapRight = gaps.right;
@@ -158,22 +179,6 @@ in
           limitTileWidth = cfg.kwin.scripts.krohnkite.settings.tileWidthLimit.enable;
           limitTileWidthRatio = cfg.kwin.scripts.krohnkite.settings.tileWidthLimit.ratio;
 
-          enableBTreeLayout = isLayoutEnabled "btree";
-          enableColumnsLayout = isLayoutEnabled "column";
-          columnsBalanced = getLayoutSetting (findLayout "column") "balanced";
-
-          enableFloatingLayout = isLayoutEnabled "floating";
-          enableMonocleLayout = isLayoutEnabled "monocle";
-          monocleMaximize = getLayoutSetting (findLayout "monocle") "maximize";
-
-          enableQuarterLayout = isLayoutEnabled "quarter";
-          enableSpiralLayout = isLayoutEnabled "spiral";
-          enableSpreadLayout = isLayoutEnabled "spread";
-          enableStackedLayout = isLayoutEnabled "stacked";
-          enableStairLayout = isLayoutEnabled "stair";
-          enableThreeColumnLayout = isLayoutEnabled "threeColumn";
-          enableTileLayout = isLayoutEnabled "tile";
-
           layoutPerActivity = cfg.kwin.scripts.krohnkite.settings.layouts.layoutPerActivity;
           layoutPerDesktop = cfg.kwin.scripts.krohnkite.settings.layouts.layoutPerDesktop;
         };