From 21f23945c6a69360d0318fe2b91296e58acc0f01 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 22 Dec 2025 15:31:33 -0600 Subject: [PATCH] Use metadata in home-manager configuration --- home/default.nix | 15 +++++++++------ network.json | 6 ++++++ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/home/default.nix b/home/default.nix index 730d9ef..c51f739 100644 --- a/home/default.nix +++ b/home/default.nix @@ -4,11 +4,14 @@ top, }: let - pkgs = system: nixpkgs.${system}; user = - system: host: username: + host: username: + let + inherit (metadata.hosts.${host}) system; + pkgs = nixpkgs.${system}; + in top.hmunstable.lib.homeManagerConfiguration { - pkgs = pkgs system; + inherit pkgs; modules = [ ../modules/nix-conf.nix ./home.nix @@ -25,11 +28,11 @@ let gnome = false; }; }; - greg = host: (user "x86_64-linux" host "greg"); + greg = host: (user host "greg"); in { - "MacBook-Pro.local" = user "aarch64-darwin" "ivr" "gregory.hellings"; - "MacBook-Prolocal.local" = user "aarch64-darwin" "ivr" "gregory.hellings"; + "MacBook-Pro.local" = user "ivr" "gregory.hellings"; + "MacBook-Prolocal.local" = user "ivr" "gregory.hellings"; genesis = greg "genesis"; exodus = greg "exodus"; zeke = greg "zeke"; diff --git a/network.json b/network.json index 43a4f65..dbba128 100644 --- a/network.json +++ b/network.json @@ -60,6 +60,12 @@ "system": "x86_64-linux", "tags": ["public", "server"] }, + "MacBook-Pro.local": { + "system": "aarc64-darwin" + }, + "MacBook-Prolocal.local": { + "system": "aarc64-darwin" + }, "nas1": { "ip": "10.42.1.14", "ts": "100.114.187.61"