feat(types): add maybeRonRaw type

Add maybeRonRaw type that allows either a raw RON value or a specified type. Also fix recursive definition in options.nix by removing rec attribute set and using explicit lib.cosmic.options reference.
HeitorAugustoLN · Jan 8, 2025 · 0c8a130 · 0c8a130
1 parent b680599
commit 0c8a130
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/lib/options.nix b/lib/options.nix
@@ -3,7 +3,7 @@
 let
   inherit (lib.cosmic.utils) nestedLiteral;
 in
-rec {
+{
   mkNullOrOption' =
     {
       type,
@@ -18,7 +18,8 @@ rec {
       }
     );
 
-  mkNullOrOption = type: description: mkNullOrOption' { inherit description type; };
+  mkNullOrOption =
+    type: description: lib.cosmic.options.mkNullOrOption' { inherit description type; };
 
   mkSettingsOption =
     {

diff --git a/lib/types.nix b/lib/types.nix
@@ -46,6 +46,22 @@
     description = "hex color";
   };
 
+  maybeRonRaw =
+    elemType:
+    let
+      ronFirst = with lib.types; either rawRon elemType;
+      elemFirst = with lib.types; either elemType rawRon;
+    in
+    ronFirst
+    // {
+      name = "maybeRonRaw";
+      inherit (elemFirst) description;
+      nestedTypes = {
+        inherit (lib.types) rawRon;
+        inherit elemType;
+      };
+    };
+
   rawRon = lib.mkOptionType {
     check =
       value: