From e55b8ee0f7073b46fb343a97ee744a95ec40d2ed Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Fri, 24 Oct 2025 09:02:29 -0700 Subject: simplify hosts management --- machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix | 37 ++++++++++++++++ .../aarch64-darwin/HQ-KWNY2VH41P/default.nix | 37 ---------------- machines/darwin/aarch64-darwin/mba-m2.nix | 49 ++++++++++++++++++++++ machines/darwin/aarch64-darwin/mba-m2/default.nix | 49 ---------------------- 4 files changed, 86 insertions(+), 86 deletions(-) create mode 100644 machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix delete mode 100644 machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix create mode 100644 machines/darwin/aarch64-darwin/mba-m2.nix delete mode 100644 machines/darwin/aarch64-darwin/mba-m2/default.nix (limited to 'machines/darwin') diff --git a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix new file mode 100644 index 0000000..19dbeb2 --- /dev/null +++ b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P.nix @@ -0,0 +1,37 @@ +{ + adminUser, + pkgs, + ... +}: +{ + imports = [ + ../../../profiles/darwin.nix + ]; + + users = { + users.${adminUser.name} = { + home = "/Users/${adminUser.name}"; + }; + }; + + environment.shells = [ pkgs.fish ]; + + programs.fish.shellInit = '' + # Nix + if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' + source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' + 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/default.nix b/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix deleted file mode 100644 index 2935834..0000000 --- a/machines/darwin/aarch64-darwin/HQ-KWNY2VH41P/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - adminUser, - pkgs, - ... -}: -{ - imports = [ - ../../../../profiles/darwin.nix - ]; - - users = { - users.${adminUser.name} = { - home = "/Users/${adminUser.name}"; - }; - }; - - environment.shells = [ pkgs.fish ]; - - programs.fish.shellInit = '' - # Nix - if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - 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/mba-m2.nix b/machines/darwin/aarch64-darwin/mba-m2.nix new file mode 100644 index 0000000..276654b --- /dev/null +++ b/machines/darwin/aarch64-darwin/mba-m2.nix @@ -0,0 +1,49 @@ +{ adminUser, pkgs, ... }: +{ + age = { + secrets = { + ssh-remote-builder = { + file = ../../../secrets/ssh-remote-builder.age; + }; + }; + }; + + imports = [ + ../../../profiles/darwin.nix + ../../../profiles/nix/remote-builder.nix + ]; + + # https://github.com/nix-darwin/nix-darwin/issues/1339 + ids.gids.nixbld = 30000; + + networking.hostName = "mba-m2"; + + users = { + users.${adminUser.name} = { + home = "/Users/${adminUser.name}"; + }; + }; + + environment.shells = [ pkgs.fish ]; + + programs.fish.shellInit = '' + # Nix + if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' + source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' + 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; + }; + + services.tailscale.enable = true; +} diff --git a/machines/darwin/aarch64-darwin/mba-m2/default.nix b/machines/darwin/aarch64-darwin/mba-m2/default.nix deleted file mode 100644 index f61c349..0000000 --- a/machines/darwin/aarch64-darwin/mba-m2/default.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ adminUser, pkgs, ... }: -{ - age = { - secrets = { - ssh-remote-builder = { - file = ../../../../secrets/ssh-remote-builder.age; - }; - }; - }; - - imports = [ - ../../../../profiles/darwin.nix - ../../../../profiles/nix/remote-builder.nix - ]; - - # https://github.com/nix-darwin/nix-darwin/issues/1339 - ids.gids.nixbld = 30000; - - networking.hostName = "mba-m2"; - - users = { - users.${adminUser.name} = { - home = "/Users/${adminUser.name}"; - }; - }; - - environment.shells = [ pkgs.fish ]; - - programs.fish.shellInit = '' - # Nix - if test -e '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - source '/nix/var/nix/profiles/default/etc/profile.d/nix-daemon.fish' - 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; - }; - - services.tailscale.enable = true; -} -- cgit v1.2.3