Skip to content

Commit 5df0987

Browse files
authored
fix: flattening default den.schema (#616)
This fixes an issue when using another nix runtime (like lix) that can't merge multiple attrs with the same name in different brackets. (ref: #615)
1 parent 2589d73 commit 5df0987

1 file changed

Lines changed: 5 additions & 7 deletions

File tree

modules/options.nix

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,11 @@ in
120120
|| throw "den.classes and den.quirks must not share keys, but found: ${builtins.concatStringsSep ", " overlap}";
121121
lib.mapAttrs (name: v: v // { inherit name; }) quirks;
122122
};
123-
config.den.schema = {
124-
conf = { };
125-
fleet = { };
126-
host.imports = [ den.schema.conf ];
127-
user.imports = [ den.schema.conf ];
128-
home.imports = [ den.schema.conf ];
129-
};
123+
config.den.schema.conf = { };
124+
config.den.schema.fleet = { };
125+
config.den.schema.host.imports = [ den.schema.conf ];
126+
config.den.schema.user.imports = [ den.schema.conf ];
127+
config.den.schema.home.imports = [ den.schema.conf ];
130128
config.den.classes = {
131129
nixos.description = "NixOS system configuration";
132130
darwin.description = "nix-darwin system configuration";

0 commit comments

Comments
 (0)