Change settings and settingsSchema

codedownio · Sep 25, 2024 · 21c5e4c · 21c5e4c
1 parent 1e98605
commit 21c5e4c
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/modules/base/convert-type.nix b/modules/base/convert-type.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 let
   convertType = target: type:

diff --git a/modules/base/nixos-options-to-settings-schema.nix b/modules/base/nixos-options-to-settings-schema.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }@args:
+{ lib, ... }@args:
 
 {
   componentsToDrop ? 0
@@ -14,16 +14,15 @@ let
   convert = v: let
     defaultItem = { type = { name = "unknown"; }; };
     loc = lib.drop componentsToDrop v.loc;
+
+    value = { inherit loc; }
+      // convertType v.name (lib.attrByPath loc defaultItem options).type
+      // lib.optionalAttrs (lib.hasAttr "default" v) { defaultValue = convertDefaultValue v.default; }
+      // (let example = (lib.attrByPath loc null options).example or null; in lib.optionalAttrs (builtins.typeOf example == "string") { title = example; })
+      // lib.optionalAttrs (lib.hasAttr "description" v && builtins.typeOf v.description == "string") { inherit (v) description; }
+      // lib.optionalAttrs (lib.hasAttr "visible" v && v.visible == false) { hidden = true; };
   in
-    {
-      target = loc;
-    }
-    // convertType v.name (lib.attrByPath loc defaultItem options).type
-    // lib.optionalAttrs (lib.hasAttr "default" v) { defaultValue = convertDefaultValue v.default; }
-    // (let example = (lib.attrByPath loc null options).example or null; in lib.optionalAttrs (builtins.typeOf example == "string") { title = example; })
-    // lib.optionalAttrs (lib.hasAttr "description" v && builtins.typeOf v.description == "string") { inherit (v) description; }
-    // lib.optionalAttrs (lib.hasAttr "visible" v && v.visible == false) { hidden = true; }
-  ;
+    { name = lib.concatStringsSep "." loc; inherit value; };
 
   evalString = str: builtins.scopedImport {} (builtins.toFile "expr.nix" str);
 
@@ -33,4 +32,4 @@ let
 
 in
 
-map convert flattened
+lib.listToAttrs (map convert flattened)
diff --git a/nix/makeEnvironment.nix b/nix/makeEnvironment.nix
@@ -31,6 +31,7 @@ let
         channel = "codedown";
 
         settings = removeNonDefaultSettings kernel.settingsSchema kernel.settings;
+        settingsSchema = mapAttrs (_: v: removeAttrs v ["loc"]) kernel.settingsSchema;
       };
     })) evaluated.config.builtKernels;
   builtLanguageServers = evaluated.config.builtLanguageServers;

diff --git a/nix/remove-non-default-settings.nix b/nix/remove-non-default-settings.nix
@@ -10,17 +10,17 @@ let
   evalString = str: builtins.scopedImport {} (builtins.toFile "expr.nix" str);
 
   getSettingsRow = schemaItem: value:
-    if value != schemaItem.defaultValue
-    then { name = concatStringsSep "." schemaItem.target; inherit value; }
+    if value != schemaItem.value.defaultValue
+    then { name = schemaItem.name; inherit value; }
     else null
   ;
 
   tryGetSettingsRow = schemaItem:
-    if hasAttrByPath schemaItem.target settings
-    then getSettingsRow schemaItem (getAttrFromPath schemaItem.target settings)
+    if hasAttrByPath schemaItem.value.loc settings
+    then getSettingsRow schemaItem (getAttrFromPath schemaItem.value.loc settings)
     else null
   ;
 
 in
 
-listToAttrs (filter (x: x != null) (map tryGetSettingsRow settingsSchema))
+listToAttrs (filter (x: x != null) (map tryGetSettingsRow (attrsToList settingsSchema)))