diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix
index 7cb2b1f..d2a8afa 100644
--- a/dot_config/flake/flake.nix
+++ b/dot_config/flake/flake.nix
@@ -10,7 +10,10 @@
     };
     nixgl.url = "github:nix-community/nixGL";
     helix.url = "github:helix-editor/helix/25.01.1";
-    darwin.url = "github:lnl7/nix-darwin";
+    darwin = {
+      url = "github:lnl7/nix-darwin/nix-darwin-24.11";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = {
@@ -45,9 +48,22 @@
     };
 
     darwinConfigurations."MAC-C57KK2TC69" = darwin.lib.darwinSystem {
-      specialArgs = {inherit inputs outputs;};
-      modules = [./home/hinge/darwin.nix];
-      
+      pkgs = allPkgs."aarch64-darwin";
+      specialArgs = {inherit inputs;};
+
+      modules = [
+        ./home/hinge/darwin.nix
+        home-manager.darwinModules.home-manager
+        {
+	 # pkgs = allPkgs."aarch64-darwin";
+          #home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+
+          home-manager.extraSpecialArgs = {inherit inputs outputs;};
+          home-manager.users."tyler.mayoff" = import ./home/hinge/hinge.nix;
+          users.users."tyler.mayoff".home = "/Users/tyler.mayoff";
+        }
+      ];
     };
 
     homeConfigurations = {
@@ -69,11 +85,11 @@
         modules = [./home/mal/mal.nix];
       };
 
-      "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration {
-        pkgs = allPkgs."aarch64-darwin";
-        extraSpecialArgs = {inherit inputs outputs;};
-        modules = [./home/hinge/hinge.nix];
-      };
+      # "tyler.mayoff@MAC-C57KK2TC69" = home-manager.lib.homeManagerConfiguration {
+      #   pkgs = allPkgs."aarch64-darwin";
+      #   extraSpecialArgs = {inherit inputs outputs;};
+      #   modules = [./home/hinge/hinge.nix];
+      # };
     };
   };
 }
diff --git a/dot_config/flake/home/common.nix b/dot_config/flake/home/common.nix
index aa7f5e9..2f2d9e5 100644
--- a/dot_config/flake/home/common.nix
+++ b/dot_config/flake/home/common.nix
@@ -4,10 +4,7 @@
   pkgs,
   ...
 }: {
-  nixpkgs.config.allowUnfree = true;
-
-  home.username = "tyler";
-  home.homeDirectory = "/home/tyler";
+  #nixpkgs.config.allowUnfree = true;
 
   home.enableNixpkgsReleaseCheck = false;
 
@@ -17,8 +14,6 @@
     ./shell.nix
     ./fish.nix
     ./nushell.nix
-    # ./nom.nix
-    # ./neovim.nix
   ];
 
   nixpkgs = {
@@ -31,7 +26,7 @@
   };
 
   home.packages = with pkgs; [
-    unstable.nix-output-monitor
+   # unstable.nix-output-monitor
 
     # dotfiles
     age
@@ -53,7 +48,7 @@
     git
 
     fzf
-    zoxide
+    just
 
     # Software Dev
     tig
@@ -114,6 +109,6 @@
     enable = true;
   };
 
-  home.stateVersion = "23.11";
+  # home.stateVersion = "23.11";
   programs.home-manager.enable = true;
 }
diff --git a/dot_config/flake/home/empty_shell.nix b/dot_config/flake/home/empty_shell.nix
index 264d4e7..cb69f38 100644
--- a/dot_config/flake/home/empty_shell.nix
+++ b/dot_config/flake/home/empty_shell.nix
@@ -3,8 +3,8 @@
     # Git
     gc = "git commit";
     gcm = "git commit -m";
-    # gac = "git add . and git commit";
-    # gacp = "gac and git push";
+    gac = "git add . and git commit";
+    gacp = "gac and git push";
     gs = "git status";
 
     # nix
diff --git a/dot_config/flake/home/guidebolt/guidebolt.nix b/dot_config/flake/home/guidebolt/guidebolt.nix
index d68916d..fe600f7 100644
--- a/dot_config/flake/home/guidebolt/guidebolt.nix
+++ b/dot_config/flake/home/guidebolt/guidebolt.nix
@@ -8,9 +8,14 @@
 }: {
   imports = [../common.nix];
 
-  home.packages = with pkgs; [
-    # clang_17
-    # clang-tools
-    just
-  ];
+  home = {
+    username = "tyler";
+    homeDirectory = "/home/tyler";
+
+    packages = with pkgs; [
+      # clang_17
+      # clang-tools
+      just
+    ];
+  };
 }
diff --git a/dot_config/flake/home/hinge/darwin.nix b/dot_config/flake/home/hinge/darwin.nix
index 7057040..aab833a 100644
--- a/dot_config/flake/home/hinge/darwin.nix
+++ b/dot_config/flake/home/hinge/darwin.nix
@@ -1,8 +1,19 @@
-{
-  inputs,
-  outputs,
-  lib,
-  ...
-}: {
+{pkgs, ...}: {
   # services.aerospace.enable = true;
+
+  imports = [
+    # ../fish.nix
+  ];
+
+  users.users."tyler.mayoff".shell = pkgs.fish;
+
+  services.sketchybar.enable = true;
+
+  system.stateVersion = 5;
+
+  environment.systemPackages = with pkgs; [
+    pinentry_mac
+  ];
+
+  programs.fish.enable = true;
 }
diff --git a/dot_config/flake/home/hinge/hinge.nix b/dot_config/flake/home/hinge/hinge.nix
index 1a0fc2a..e402083 100644
--- a/dot_config/flake/home/hinge/hinge.nix
+++ b/dot_config/flake/home/hinge/hinge.nix
@@ -1,16 +1,14 @@
-{
-  lib,
-  pkgs,
-  ...
-}: {
+{pkgs, ...}: {
   imports = [
     ../common.nix
     ../kitty.nix
   ];
 
+  # xdg.enable = lib.mkForce false;
+
   home = {
-    username = lib.mkForce "tyler.mayoff";
-    homeDirectory = lib.mkForce "/Users/tyler.mayoff";
+    username = "tyler.mayoff";
+    # homeDirectory = /Users/tyler.mayoff;
 
     packages = with pkgs; [
       bazel_7
@@ -40,4 +38,6 @@
       PATH = "$PATH:/Users/tyler.mayoff/Library/Android/sdk/platform-tools";
     };
   };
+
+  home.stateVersion = "24.11";
 }
diff --git a/dot_config/flake/home/mal/mal.nix b/dot_config/flake/home/mal/mal.nix
index efc4eac..f64fd05 100644
--- a/dot_config/flake/home/mal/mal.nix
+++ b/dot_config/flake/home/mal/mal.nix
@@ -1,3 +1,8 @@
 {pkgs, ...}: {
   imports = [../common.nix];
+
+  home = {
+    username = "tyler";
+    homeDirectory = "/home/tyler";
+  };
 }
diff --git a/dot_config/flake/home/nushell.nix b/dot_config/flake/home/nushell.nix
index e9b5c26..9fc859d 100644
--- a/dot_config/flake/home/nushell.nix
+++ b/dot_config/flake/home/nushell.nix
@@ -6,6 +6,9 @@
       config.home.shellAliases;
 
     extraConfig = ''
+      $env.PATH = ($env.PATH | split row (char esep) | append "~/.nix-profile/bin")
+      $env.PATH = ($env.PATH | split row (char esep) | append "/nix/var/nix/profiles/default/bin")
+    
       $env.config.show_banner = false
 
       def gac [] { git add .; git commit }
diff --git a/dot_config/flake/home/wash/wash.nix b/dot_config/flake/home/wash/wash.nix
index b854704..a18d237 100644
--- a/dot_config/flake/home/wash/wash.nix
+++ b/dot_config/flake/home/wash/wash.nix
@@ -5,8 +5,13 @@
 }: {
   imports = [../common.nix ../gnome.nix ../home-backup.nix ../gui.nix];
 
-  home.packages = with pkgs; [
-    ventoy
-    (config.lib.nixGL.wrap renderdoc)
-  ];
+  home = {
+    username = "tyler";
+    homeDirectory = "/home/tyler";
+
+    packages = with pkgs; [
+      ventoy
+      (config.lib.nixGL.wrap renderdoc)
+    ];
+  };
 }