Updates across the board to support nix-darwin again

darwin/default.nix

@@ -14,14 +14,17 @@ let
     top.darwin.lib.darwinSystem {
       inherit system;
       specialArgs = {
+        inherit (top) self;
         inherit nixpkgs;
       };
       modules = [
         {
           nixpkgs.overlays = overlays;
-          home-manager.extraSpecialArgs = {
-            inherit top;
-            host = name;
+          home-manager = {
+            extraSpecialArgs = {
+              inherit top;
+              host = name;
+            };
           };
         }
         hm.darwinModules.home-manager
@@ -30,6 +33,5 @@ let
     };
 in
 rec {
-  la23002 = mac { name = "ivr"; };
-  LA23002 = la23002;
+  "MacBook-Pro" = mac { name = "ivr"; };
 }

darwin/hosts/ivr/default.nix

@@ -1,9 +1,12 @@
 { ... }:
+let
+  username = "gregory.hellings";
+in
 {
-  #environment.loginShell = lib.getExe pkgs.xonsh;
-  homebrews = {
+  homebrew = {
     enable = true;
     brews = [
+      "bitwarden-cli"
       "direnv"
       {
         name = "libvirt";
@@ -14,6 +17,7 @@
     ];
     casks = [
       "alt-tab"
+      "bitwarden"
       "bruno"
       "chromium"
       "firefox"
@@ -24,5 +28,13 @@
       "visual-studio-code"
       "zed"
     ];
+    user = username;
+  };
+
+  system.primaryUser = username;
+
+  users.users."${username}" = {
+    name = username;
+    home = "/Users/${username}";
   };
 }