diff --git a/lib/default.nix b/lib/default.nix index ce1d2799..84aaf415 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -49,6 +49,7 @@ modules = [ ../nixos + ../nixos/common/modules/installer.nix inputs.sops-nix.nixosModules.sops inputs.lanzaboote.nixosModules.lanzaboote inputs.home-manager.nixosModules.home-manager { @@ -75,6 +76,7 @@ modules = [ ../nixos/minimal.nix + ../nixos/common/modules/installer.nix inputs.sops-nix.nixosModules.sops inputs.lanzaboote.nixosModules.lanzaboote ]; diff --git a/nixos/users/albert/installer.nix b/nixos/common/modules/installer.nix similarity index 100% rename from nixos/users/albert/installer.nix rename to nixos/common/modules/installer.nix diff --git a/nixos/users/albert/default.nix b/nixos/users/albert/default.nix index 13677bfb..0b159b89 100644 --- a/nixos/users/albert/default.nix +++ b/nixos/users/albert/default.nix @@ -3,7 +3,7 @@ let ifExists = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups; in { # Define a user account. - imports = [ ./installer.nix ] ++ lib.optional (builtins.isString desktop) ./desktop.nix; + imports = [ ] ++ lib.optional (builtins.isString desktop) ./desktop.nix; users.mutableUsers = false; users.users.albert = { isNormalUser = true;