diff options
| author | Franck Cuny <franck@fcuny.net> | 2025-11-02 13:06:05 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2025-11-02 13:06:05 -0800 |
| commit | cb961051f8307a0bfd6e75acb52a7b7ac003e4d0 (patch) | |
| tree | c2e3e29716bf10bb5d95d2c11d8692672c379c5f /machines/darwin | |
| parent | move remote-unlock as a profile (diff) | |
| download | infra-cb961051f8307a0bfd6e75acb52a7b7ac003e4d0.tar.gz | |
simplify configuration for darwin
Diffstat (limited to 'machines/darwin')
| -rw-r--r-- | machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix | 6 | ||||
| -rw-r--r-- | machines/darwin/aarch64-darwin/mba-m2.nix | 13 |
2 files changed, 17 insertions, 2 deletions
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix index 19dbeb2..761b20e 100644 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix @@ -6,6 +6,7 @@ { imports = [ ../../../profiles/darwin.nix + ../../../profiles/home-manager.nix ]; users = { @@ -14,6 +15,10 @@ }; }; + environment.systemPackages = with pkgs; [ + fish + ]; + environment.shells = [ pkgs.fish ]; programs.fish.shellInit = '' @@ -31,6 +36,7 @@ imports = [ ../../../home/profiles/mac.nix ../../../home/profiles/work.nix + ../../../home/profiles/workstation.nix ]; inherit (adminUser) userinfo; }; diff --git a/machines/darwin/aarch64-darwin/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix index 276654b..943ccf0 100644 --- a/machines/darwin/aarch64-darwin/mba-m2.nix +++ b/machines/darwin/aarch64-darwin/mba-m2.nix @@ -10,6 +10,7 @@ imports = [ ../../../profiles/darwin.nix + ../../../profiles/home-manager.nix ../../../profiles/nix/remote-builder.nix ]; @@ -18,12 +19,18 @@ networking.hostName = "mba-m2"; + services.tailscale.enable = true; + users = { users.${adminUser.name} = { home = "/Users/${adminUser.name}"; }; }; + environment.systemPackages = with pkgs; [ + fish + ]; + environment.shells = [ pkgs.fish ]; programs.fish.shellInit = '' @@ -38,12 +45,14 @@ home.stateVersion = "23.05"; home.username = "${adminUser.name}"; home.homeDirectory = "/Users/${adminUser.name}"; + home.packages = with pkgs; [ + element-desktop + ]; imports = [ ../../../home/profiles/mac.nix ../../../home/profiles/media.nix + ../../../home/profiles/workstation.nix ]; inherit (adminUser) userinfo; }; - - services.tailscale.enable = true; } |