diff options
Diffstat (limited to 'machines/darwin')
5 files changed, 55 insertions, 56 deletions
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix index 2ffe2cb..e9d78eb 100644 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix @@ -5,30 +5,38 @@ ... }: { - imports = [ + { + home-manager.users.${adminUser.name} = { + home.homeDirectory = "/Users/${adminUser.name}"; + imports = [ + ./home.nix + { home.stateVersion = "23.05"; } + ]; + inherit (adminUser) userinfo; + programs.git.userEmail = "fcuny@roblox.com"; + }; + } "${self}/profiles/programs/home-manager.nix" "${self}/profiles/darwin/desktop.nix" "${self}/profiles/darwin/keyboard.nix" "${self}/profiles/darwin/nix.nix" "${self}/profiles/darwin/security.nix" "${self}/profiles/desktop/fonts.nix" + "${self}/profiles/programs/fish.nix" + "${self}/profiles/programs/ssh.nix" ]; system.primaryUser = adminUser.name; - # The user should already exist, but we need to set this up so Nix knows - # what our home directory is (https://github.com/LnL7/nix-darwin/issues/423). users = { users.${adminUser.name} = { home = "/Users/${adminUser.name}"; - shell = pkgs.fish; }; }; environment.shells = [ pkgs.fish ]; - programs.fish.enable = true; programs.fish.shellInit = '' # Nix if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' @@ -36,22 +44,4 @@ end # End Nix ''; - - programs.ssh.knownHosts = { - "github.com".publicKey = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; - }; - - home-manager.users.${adminUser.name} = { - home.stateVersion = "23.05"; - home.username = "${adminUser.name}"; - home.homeDirectory = "/Users/${adminUser.name}"; - home.packages = with pkgs; [ grpcurl ]; - imports = [ - "${self}/home/profiles/mac.nix" - "${self}/home/profiles/work.nix" - ]; - inherit (adminUser) userinfo; - programs.git.userEmail = "fcuny@roblox.com"; - }; } diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix new file mode 100644 index 0000000..fdc0dcd --- /dev/null +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix @@ -0,0 +1,7 @@ +{ self, ... }: +{ + imports = [ + "${self}/home/profiles/mac.nix" + "${self}/home/profiles/work.nix" + ]; +} diff --git a/machines/darwin/aarch64-darwin/mba-m2/default.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix index e897cf0..d2f66bf 100644 --- a/machines/darwin/aarch64-darwin/mba-m2/default.nix +++ b/machines/darwin/aarch64-darwin/mba-m2/default.nix @@ -5,16 +5,18 @@ ... }: { - - age = { - secrets = { - ssh-remote-builder = { - file = "${self}/secrets/ssh-remote-builder.age"; - }; - }; - }; - imports = [ + ./secrets.nix + { + home-manager.users.${adminUser.name} = { + home.homeDirectory = "/Users/${adminUser.name}"; + imports = [ + ./home.nix + { home.stateVersion = "23.05"; } + ]; + inherit (adminUser) userinfo; + }; + } "${self}/profiles/programs/home-manager.nix" "${self}/profiles/nix/remote-builder.nix" "${self}/profiles/darwin/desktop.nix" @@ -22,6 +24,8 @@ "${self}/profiles/darwin/nix.nix" "${self}/profiles/darwin/security.nix" "${self}/profiles/desktop/fonts.nix" + "${self}/profiles/programs/fish.nix" + "${self}/profiles/programs/ssh.nix" ]; system.primaryUser = adminUser.name; @@ -31,18 +35,14 @@ networking.hostName = "mba-m2"; - # The user should already exist, but we need to set this up so Nix knows - # what our home directory is (https://github.com/LnL7/nix-darwin/issues/423). users = { users.${adminUser.name} = { home = "/Users/${adminUser.name}"; - shell = pkgs.fish; }; }; environment.shells = [ pkgs.fish ]; - programs.fish.enable = true; programs.fish.shellInit = '' # Nix if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' @@ -50,24 +50,4 @@ end # End Nix ''; - - programs.ssh.knownHosts = { - "github.com".publicKey = - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl"; - }; - - home-manager.users.${adminUser.name} = { - home.stateVersion = "23.05"; - home.username = "${adminUser.name}"; - home.homeDirectory = "/Users/${adminUser.name}"; - home.packages = with pkgs; [ - element-desktop - zoom-us - ]; - imports = [ - "${self}/home/profiles/mac.nix" - "${self}/home/profiles/media.nix" - ]; - inherit (adminUser) userinfo; - }; } diff --git a/machines/darwin/aarch64-darwin/mba-m2/home.nix b/machines/darwin/aarch64-darwin/mba-m2/home.nix new file mode 100644 index 0000000..23236bf --- /dev/null +++ b/machines/darwin/aarch64-darwin/mba-m2/home.nix @@ -0,0 +1,12 @@ +{ self, pkgs, ... }: +{ + home.packages = with pkgs; [ + element-desktop + zoom-us + ]; + + imports = [ + "${self}/home/profiles/mac.nix" + "${self}/home/profiles/media.nix" + ]; +} diff --git a/machines/darwin/aarch64-darwin/mba-m2/secrets.nix b/machines/darwin/aarch64-darwin/mba-m2/secrets.nix new file mode 100644 index 0000000..079b38d --- /dev/null +++ b/machines/darwin/aarch64-darwin/mba-m2/secrets.nix @@ -0,0 +1,10 @@ +{ self, ... }: +{ + age = { + secrets = { + ssh-remote-builder = { + file = "${self}/secrets/ssh-remote-builder.age"; + }; + }; + }; +} |