Pass size and position values to convert

nix-community · Aug 21, 2024 · 0ab9e41 · 0ab9e41
1 parent 19acdaf
commit 0ab9e41
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 23 deletions.
diff --git a/modules/widgets/application-title-bar.nix b/modules/widgets/application-title-bar.nix
@@ -466,7 +466,9 @@ in
       };
     };
     convert =
-      { layout
+      { position
+      , size
+      , layout
       , windowControlButtons
       , windowTitle
       , overrideForMaximized

diff --git a/modules/widgets/battery.nix b/modules/widgets/battery.nix
@@ -36,13 +36,18 @@ in {
       };
     };
 
-    convert = { showPercentage, settings }: {
-      name = "org.kde.plasma.battery";
-      config = lib.recursiveUpdate {
-        General = lib.filterAttrs (_: v: v != null) {
-          inherit showPercentage;
-        };
-      } settings;
+    convert = 
+      { position
+      , size
+      , showPercentage
+      , settings
+      }: {
+        name = "org.kde.plasma.battery";
+        config = lib.recursiveUpdate {
+          General = lib.filterAttrs (_: v: v != null) {
+            inherit showPercentage;
+          };
+        } settings;
     };
   };
 }
diff --git a/modules/widgets/digital-clock.nix b/modules/widgets/digital-clock.nix
@@ -249,7 +249,9 @@ in
     };
 
     convert =
-      { date
+      { position
+      , size
+      , date
       , time
       , timeZone
       , calendar

diff --git a/modules/widgets/icon-tasks.nix b/modules/widgets/icon-tasks.nix
@@ -157,7 +157,9 @@ in
       };
     };
     convert =
-      { appearance
+      { position
+      , size
+      , appearance
       , behavior
       , launchers
       , settings

diff --git a/modules/widgets/keyboard-layout.nix b/modules/widgets/keyboard-layout.nix
@@ -48,13 +48,18 @@ in
       };
     };
 
-    convert = { displayStyle, settings }: {
-      name = "org.kde.plasma.keyboardlayout";
-      config = lib.recursiveUpdate {
-        General = lib.filterAttrs (_: v: v != null) {
-          inherit displayStyle;
-        };
-      } settings;
+    convert =
+      { position
+      , size
+      , displayStyle
+      , settings
+      }: {
+        name = "org.kde.plasma.keyboardlayout";
+        config = lib.recursiveUpdate {
+          General = lib.filterAttrs (_: v: v != null) {
+            inherit displayStyle;
+          };
+        } settings;
     };
   };
 }
diff --git a/modules/widgets/kicker.nix b/modules/widgets/kicker.nix
@@ -106,7 +106,9 @@ in
       };
     };
     convert =
-      { icon
+      { position
+      , size
+      , icon
       , customButtonImage
       , applicationNameFormat
       , behavior

diff --git a/modules/widgets/kickerdash.nix b/modules/widgets/kickerdash.nix
@@ -99,7 +99,9 @@ in
       };
     };
     convert =
-      { icon
+      { position
+      , size
+      , icon
       , customButtonImage
       , applicationNameFormat
       , behavior

diff --git a/modules/widgets/kickoff.nix b/modules/widgets/kickoff.nix
@@ -119,7 +119,9 @@ in
       };
     };
     convert =
-      { icon
+      { position
+      , size
+      , icon
       , label
       , sortAlphabetically
       , compactDisplayStyle

diff --git a/modules/widgets/plasma-panel-colorizer.nix b/modules/widgets/plasma-panel-colorizer.nix
@@ -728,7 +728,9 @@ in
       };
     };
     convert =
-      { general
+      { position
+      , size
+      , general
       , presetAutoLoading
       , widgetBackground
       , textAndIcons

diff --git a/modules/widgets/system-monitor.nix b/modules/widgets/system-monitor.nix
@@ -157,7 +157,9 @@ in
     };
 
     convert =
-      { title
+      { position
+      , size
+      , title
       , showTitle
       , showLegend
       , displayStyle

diff --git a/modules/widgets/system-tray.nix b/modules/widgets/system-tray.nix
@@ -173,7 +173,9 @@ in
     });
 
     convert =
-      { pin
+      { position
+      , size
+      , pin
       , icons
       , items
       , settings