diff --git a/modules/darwin/homebrew.nix b/modules/darwin/homebrew.nix
index 037bb28..b313792 100644
--- a/modules/darwin/homebrew.nix
+++ b/modules/darwin/homebrew.nix
@@ -9,8 +9,8 @@
   # Homebrew - Mac-specific packages that aren't in Nix
   config = lib.mkIf pkgs.stdenv.isDarwin {
 
-    # Requires Homebrew to be installed
-    system.activationScripts.preUserActivation.text = ''
+    # # Requires Homebrew to be installed
+    system.activationScripts.preActivation.text = ''
       if ! xcode-select --version 2>/dev/null; then
         $DRY_RUN_CMD xcode-select --install
       fi
diff --git a/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix b/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
index eab31eb..6727f7b 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/programs/homebrew.nix
@@ -15,7 +15,7 @@ in
 
   config = lib.mkIf cfg.enable {
     # Requires Homebrew to be installed
-    system.activationScripts.preUserActivation.text = ''
+    system.activationScripts.preActivation.text = ''
       if ! xcode-select --version 2>/dev/null; then
         $DRY_RUN_CMD xcode-select --install
       fi
diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix b/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
index 401478b..65bf9f1 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/services/finder.nix
@@ -59,7 +59,7 @@ in
     };
 
     # User-level settings
-    system.activationScripts.postUserActivation.text = ''
+    system.activationScripts.postActivation.text = ''
       echo "Show the ~/Library folder"
       chflags nohidden ~/Library
     '';
diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix b/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
index cb26e59..2a42530 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/services/hammerspoon.nix
@@ -18,7 +18,7 @@ in
 
     homebrew.casks = [ "hammerspoon" ];
 
-    system.activationScripts.postUserActivation.text = ''
+    system.activationScripts.postActivation.text = ''
       defaults write org.hammerspoon.Hammerspoon MJConfigFile "${
         config.home-manager.users.${username}.xdg.configHome
       }/hammerspoon/init.lua"
diff --git a/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix b/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
index bc1d758..de82430 100644
--- a/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
+++ b/platforms/nix-darwin/modules/nmasur/presets/services/menubar.nix
@@ -15,7 +15,7 @@ in
   config = lib.mkIf cfg.enable {
 
     # User-level settings
-    system.activationScripts.postUserActivation.text = ''
+    system.activationScripts.postActivation.text = ''
       echo "Reduce Menu Bar padding"
       defaults write -globalDomain NSStatusItemSelectionPadding -int 6
       defaults write -globalDomain NSStatusItemSpacing -int 6
diff --git a/platforms/nix-darwin/modules/nmasur/profiles/base.nix b/platforms/nix-darwin/modules/nmasur/profiles/base.nix
index 96de82b..f1f7f35 100644
--- a/platforms/nix-darwin/modules/nmasur/profiles/base.nix
+++ b/platforms/nix-darwin/modules/nmasur/profiles/base.nix
@@ -14,6 +14,8 @@ in
 
   config = lib.mkIf cfg.enable {
 
+    system.primaryUser = config.nmasur.settings.username;
+
     nmasur.presets = {
       programs = {
         fish.enable = lib.mkDefault true;