diff --git a/home/default.nix b/home/default.nix index cc4db7b..5d1369b 100644 --- a/home/default.nix +++ b/home/default.nix @@ -13,10 +13,8 @@ let allowUnfreePredicate = _: true; }; }); - ivr = - let - system = "aarch64-darwin"; - in + user = + system: host: username: top.hmunstable.lib.homeManagerConfiguration { pkgs = pkgs system; modules = [ @@ -24,15 +22,17 @@ let ./home.nix ]; extraSpecialArgs = { - inherit top; + inherit top host username; nixvim = top.nixvimunstable; gui = false; gnome = false; - host = "ivr"; - username = "gregory.hellings"; }; }; + greg = host: (user "x86_64-linux" host "greg"); in { - "MacBook-Pro.local" = ivr; + "MacBook-Pro.local" = user "aarch64-darwin" "ivr" "gregory.hellings"; + exodus = greg "exodus"; + jude = greg "jude"; + isaiah = greg "isaiah"; } diff --git a/home/home.nix b/home/home.nix index 114514c..1125e3a 100644 --- a/home/home.nix +++ b/home/home.nix @@ -3,9 +3,18 @@ lib, host ? "most", top, + username, ... }: - +let + homeDirectory = + if pkgs.stdenv.hostPlatform.isDarwin then + "/Users/${username}" + else if username == "root" then + "/root" + else + "/home/${username}"; +in { imports = [ top.nixvimunstable.homeManagerModules.nixvim @@ -13,30 +22,33 @@ ./baseline ] ++ lib.optionals (builtins.pathExists ./hosts/${host}) [ ./hosts/${host} ]; - home.stateVersion = "25.05"; + home = { + inherit homeDirectory username; - home.packages = with pkgs; [ - copier - diffutils - findutils - gh - git - gnupatch - hms - btop - inetutils - jq - nano - nix-prefetch - nmap - openssl - setup-ssh - tmux - tree - unzip - wget - zip - ]; + packages = with pkgs; [ + copier + diffutils + findutils + gh + git + gnupatch + hms + btop + inetutils + jq + nano + nix-prefetch + nmap + openssl + setup-ssh + tmux + tree + unzip + wget + zip + ]; + stateVersion = "25.05"; + }; programs.tmux = { enable = true; diff --git a/hosts/exodus/default.nix b/hosts/exodus/default.nix index b1730ad..3c6b83d 100644 --- a/hosts/exodus/default.nix +++ b/hosts/exodus/default.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, top, ... }: @@ -23,8 +22,6 @@ ]; }; - environment.defaultPackages = [ pkgs.code-cursor ]; - greg = { home = true; gnome.enable = true;