Fix building of home and remove cursor

home/default.nix

@@ -13,10 +13,8 @@ let
         allowUnfreePredicate = _: true;
       };
     });
-  ivr =
+  user =
-    let
+    system: host: username:
-      system = "aarch64-darwin";
-    in
     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";
 }

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; [
+    packages = with pkgs; [
-    copier
+      copier
-    diffutils
+      diffutils
-    findutils
+      findutils
-    gh
+      gh
-    git
+      git
-    gnupatch
+      gnupatch
-    hms
+      hms
-    btop
+      btop
-    inetutils
+      inetutils
-    jq
+      jq
-    nano
+      nano
-    nix-prefetch
+      nix-prefetch
-    nmap
+      nmap
-    openssl
+      openssl
-    setup-ssh
+      setup-ssh
-    tmux
+      tmux
-    tree
+      tree
-    unzip
+      unzip
-    wget
+      wget
-    zip
+      zip
-  ];
+    ];
+    stateVersion = "25.05";
+  };
 
   programs.tmux = {
     enable = true;

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;