diff --git a/flake.nix b/flake.nix index 533e78c..4b6ba6a 100644 --- a/flake.nix +++ b/flake.nix @@ -19,10 +19,10 @@ profiles = import ./profiles.nix; in { - homeConfigurations = nixpkgs.lib.genAttrs (builtins.map (user: user.username) profiles) ( - user: + homeConfigurations = nixpkgs.lib.genAttrs (builtins.map (p: p.name) profiles) ( + profile: let - system = (nixpkgs.lib.findFirst (u: u.username == user) null profiles).architecture; + system = (nixpkgs.lib.findFirst (p: p.name == profile) null profiles).architecture; pkgs = nixpkgs.legacyPackages.${system}; in home-manager.lib.homeManagerConfiguration { @@ -31,8 +31,8 @@ modules = [ ./home.nix ]; extraSpecialArgs = { - username = user; - homeDirectory = (nixpkgs.lib.findFirst (u: u.username == user) null profiles).homeDirectory; + username = (nixpkgs.lib.findFirst (p: p.name == profile) null profiles).username; + homeDirectory = (nixpkgs.lib.findFirst (p: p.name == profile) null profiles).homeDirectory; }; } ); diff --git a/profiles.nix b/profiles.nix index 4c770bb..f7607b1 100644 --- a/profiles.nix +++ b/profiles.nix @@ -1,21 +1,25 @@ [ { - username = "root_x86_linux"; + name = "root_x86_linux"; + username = "root"; architecture = "x86_64-linux"; homeDirectory = "/root"; } { - username = "root_x86_macos"; + name = "root_x86_macos"; + username = "root"; architecture = "x86_64-darwin"; homeDirectory = "/root"; } { - username = "root_arm_linux"; + name = "root_arm_linux"; + username = "root"; architecture = "aarch64-linux"; homeDirectory = "/root"; } { - username = "root_arm_macos"; + name = "root_arm_macos"; + username = "root"; architecture = "aarch64-darwin"; homeDirectory = "/root"; }