Update kicker and kickerdash settings option value type (#322)

Also remove unnecessary `types.nullOr` from other widgets
nix-community · Aug 13, 2024 · 76dab4b · 76dab4b
1 parent f8b0d72
commit 76dab4b
Show file tree

Hide file tree

Showing 12 changed files with 14 additions and 12 deletions.
diff --git a/modules/widgets/application-title-bar.nix b/modules/widgets/application-title-bar.nix
@@ -439,7 +439,7 @@ in
         };
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           Appearance = {

diff --git a/modules/widgets/battery.nix b/modules/widgets/battery.nix
@@ -14,7 +14,7 @@ in {
         description = "Enable to show the battery percentage as a small label over the battery icon.";
       };
       settings = lib.mkOption {
-        type = lib.types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/digital-clock.nix b/modules/widgets/digital-clock.nix
@@ -221,7 +221,7 @@ in
           };
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           Appearance = {

diff --git a/modules/widgets/icon-tasks.nix b/modules/widgets/icon-tasks.nix
@@ -134,7 +134,7 @@ in
         };
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/keyboard-layout.nix b/modules/widgets/keyboard-layout.nix
@@ -26,7 +26,7 @@ in
           apply = getIndexFromEnum enumVals;
         };
       settings = lib.mkOption {
-        type = lib.types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/kicker.nix b/modules/widgets/kicker.nix
@@ -1,6 +1,7 @@
 { lib, ... }:
 let
   inherit (lib) mkOption types;
+  inherit (import ./lib.nix { inherit lib; }) configValueType;
 
   mkBoolOption = description: mkOption {
     type = with types; nullOr bool;
@@ -82,7 +83,7 @@ in
         expandSearchResults = mkBoolOption "Whether to expand the search results to bookmarks, files and emails.";
       };
       settings = mkOption {
-        type = with types; nullOr (attrsOf (attrsOf (either (oneOf [ bool float int str ]) (listOf (oneOf [ bool float int str ])))));
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/kickerdash.nix b/modules/widgets/kickerdash.nix
@@ -1,6 +1,7 @@
 { lib, ... }:
 let
   inherit (lib) mkOption types;
+  inherit (import ./lib.nix { inherit lib; }) configValueType;
 
   mkBoolOption = description: mkOption {
     type = with types; nullOr bool;
@@ -75,7 +76,7 @@ in
         expandSearchResults = mkBoolOption "Whether to expand the search results to bookmarks, files and emails.";
       };
       settings = mkOption {
-        type = with types; nullOr (attrsOf (attrsOf (either (oneOf [ bool float int str ]) (listOf (oneOf [ bool float int str ])))));
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/kickoff.nix b/modules/widgets/kickoff.nix
@@ -95,7 +95,7 @@ in
         example = 700;
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/plasma-panel-colorizer.nix b/modules/widgets/plasma-panel-colorizer.nix
@@ -698,7 +698,7 @@ in
         };
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/plasmusic-toolbar.nix b/modules/widgets/plasmusic-toolbar.nix
@@ -293,7 +293,7 @@ in
         apply = font: if font == null then null else qfont.fontToString font;
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         example = {
           General = {

diff --git a/modules/widgets/system-monitor.nix b/modules/widgets/system-monitor.nix
@@ -138,7 +138,7 @@ in
         };
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         description = "Extra configuration options for the widget.";
         apply = settings: if settings == null then {} else settings;

diff --git a/modules/widgets/system-tray.nix b/modules/widgets/system-tray.nix
@@ -154,7 +154,7 @@ in
         };
       };
       settings = mkOption {
-        type = types.nullOr configValueType;
+        type = configValueType;
         default = null;
         description = "Extra configuration options for the widget.";
         apply = settings: if settings == null then {} else settings;