diff options
| author | Franck Cuny <franck@fcuny.net> | 2025-10-23 06:48:26 -0700 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2025-10-23 06:48:26 -0700 |
| commit | 9507edf2d9c1bca3c8c79e4b510a8ef870717f71 (patch) | |
| tree | 21ff14367e8df4d4bb3a18b75a0ce67a9a9f9472 /machines | |
| parent | move keycloak and forgejo on rivendell (diff) | |
| download | infra-9507edf2d9c1bca3c8c79e4b510a8ef870717f71.tar.gz | |
simplify darwin configuration
Remove a bunch of files and consolidate everything into the host's file.
Diffstat (limited to 'machines')
5 files changed, 34 insertions, 62 deletions
diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix index 58761dd..2935834 100644 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix @@ -5,21 +5,9 @@ }: { 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"; - }; - } + ../../../../profiles/darwin.nix ]; - system.primaryUser = adminUser.name; - users = { users.${adminUser.name} = { home = "/Users/${adminUser.name}"; @@ -35,4 +23,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/work.nix + ]; + inherit (adminUser) userinfo; + }; } diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix deleted file mode 100644 index fdc0dcd..0000000 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/home.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ 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 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; + }; } diff --git a/machines/darwin/aarch64-darwin/mba-m2/home.nix b/machines/darwin/aarch64-darwin/mba-m2/home.nix deleted file mode 100644 index 23236bf..0000000 --- a/machines/darwin/aarch64-darwin/mba-m2/home.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ 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 deleted file mode 100644 index 079b38d..0000000 --- a/machines/darwin/aarch64-darwin/mba-m2/secrets.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ self, ... }: -{ - age = { - secrets = { - ssh-remote-builder = { - file = "${self}/secrets/ssh-remote-builder.age"; - }; - }; - }; -} |