From 9bd1c3bcd7343dc7271226947628f9dd32540743 Mon Sep 17 00:00:00 2001 From: fmway Date: Tue, 16 Jun 2026 20:18:12 +0700 Subject: [PATCH] fix: flattening default den.schema This fixes an issue when using another nix runtime (like lix) that can't merge multiple attrs with the same name in different brackets. --- modules/options.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/modules/options.nix b/modules/options.nix index 822f7311..599e7e34 100644 --- a/modules/options.nix +++ b/modules/options.nix @@ -120,13 +120,11 @@ in || throw "den.classes and den.quirks must not share keys, but found: ${builtins.concatStringsSep ", " overlap}"; lib.mapAttrs (name: v: v // { inherit name; }) quirks; }; - config.den.schema = { - conf = { }; - fleet = { }; - host.imports = [ den.schema.conf ]; - user.imports = [ den.schema.conf ]; - home.imports = [ den.schema.conf ]; - }; + config.den.schema.conf = { }; + config.den.schema.fleet = { }; + config.den.schema.host.imports = [ den.schema.conf ]; + config.den.schema.user.imports = [ den.schema.conf ]; + config.den.schema.home.imports = [ den.schema.conf ]; config.den.classes = { nixos.description = "NixOS system configuration"; darwin.description = "nix-darwin system configuration";