diff --git a/hosts/default.nix b/hosts/default.nix index f3f3ed8..3bfd1dd 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -134,18 +134,20 @@ let "hostname" "modules" "buildMethods" + "wslUser" ]; extraConfig = lib.removeAttrs devConf [ "extraUsers" "flakeUrl" "hostname" "buildMethods" + "wslUser" ]; in lib.mkIf hasOverride (lib.recursiveUpdate (lib.recursiveUpdate { host.filesystem = fsConf; modules.users.enabledUsers = devConf.extraUsers or [ ]; - } (lib.optionalAttrs (devConf ? buildMethods) { host.buildMethods = devConf.buildMethods; })) extraConfig); + } (lib.optionalAttrs (devConf ? buildMethods) { host.buildMethods = devConf.buildMethods; } // lib.optionalAttrs (devConf ? wslUser) { host.wsl.user = devConf.wslUser; })) extraConfig); config = mkHost { hostName = hostName; diff --git a/inventory.nix b/inventory.nix index 49b9956..18ffa5f 100644 --- a/inventory.nix +++ b/inventory.nix @@ -68,7 +68,7 @@ "1" = { hostname = "nix-wsl-alireza"; extraUsers = [ "sv22900" ]; - modules.wsl.user = "sv22900"; + wslUser = "sv22900"; }; }; };