diff options
Diffstat (limited to 'machines/darwin/aarch64-darwin/mba-m2/default.nix')
| -rw-r--r-- | machines/darwin/aarch64-darwin/mba-m2/default.nix | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/machines/darwin/aarch64-darwin/mba-m2/default.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix index f11dcf5..db5ed48 100644 --- a/machines/darwin/aarch64-darwin/mba-m2/default.nix +++ b/machines/darwin/aarch64-darwin/mba-m2/default.nix @@ -1,26 +1,17 @@ +{ adminUser, pkgs, ... }: { - adminUser, - pkgs, - self, - ... -}: -{ - imports = [ - ./secrets.nix - { - home-manager.users.${adminUser.name} = { - home.homeDirectory = "/Users/${adminUser.name}"; - imports = [ - ./home.nix - { home.stateVersion = "23.05"; } - ]; - inherit (adminUser) userinfo; + age = { + secrets = { + ssh-remote-builder = { + file = ../../../../secrets/ssh-remote-builder.age; }; - } - "${self}/profiles/nix/remote-builder.nix" - ]; + }; + }; - system.primaryUser = adminUser.name; + imports = [ + ../../../../profiles/darwin.nix + ../../../../profiles/nix/remote-builder.nix + ]; # https://github.com/nix-darwin/nix-darwin/issues/1339 ids.gids.nixbld = 30000; @@ -42,4 +33,15 @@ end # End Nix ''; + + home-manager.users.${adminUser.name} = { + home.stateVersion = "23.05"; + home.username = "${adminUser.name}"; + home.homeDirectory = "/Users/${adminUser.name}"; + imports = [ + ../../../../home/profiles/mac.nix + ../../../../home/profiles/media.nix + ]; + inherit (adminUser) userinfo; + }; } |