diff --git a/flake.nix b/flake.nix
index d5ec7c3e..39ecd2f8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -169,6 +169,7 @@
                 };
                 darwinMachinesPerSystem = {
                   aarch64-darwin = [
+                    "mhelton-mbp14"
                   ];
                 };
                 nixosMachines = lib.mapAttrs' (n: lib.nameValuePair "nixos-${n}") (
@@ -348,6 +349,29 @@
           };
 
           darwinConfigurations = {
+            mhelton-mbp14 = withSystem "aarch64-darwin" (
+              { pkgs, ... }:
+              darwin.lib.darwinSystem {
+                specialArgs = { inherit inputs; };
+                modules = (builtins.attrValues darwinModules) ++ [
+                  { nixpkgs.pkgs = pkgs; }
+                  ./hosts/mhelton-mbp14
+                  home-manager.darwinModules.home-manager
+                  {
+                    home-manager = {
+                      useGlobalPkgs = true;
+                      useUserPackages = true;
+                      extraSpecialArgs = { inherit inputs; };
+                      users.mhelton.imports = [
+                        ./home/mhelton
+                        ./home/mhelton/work.nix
+                        ./home/mhelton/darwin.nix
+                      ];
+                    };
+                  }
+                ];
+              }
+            );
           };
         };
 
diff --git a/home/mhelton/graphical.nix b/home/mhelton/graphical.nix
index eea94a1d..aa7fdfba 100644
--- a/home/mhelton/graphical.nix
+++ b/home/mhelton/graphical.nix
@@ -8,7 +8,10 @@ let
   withPlasma = osConfig.services.desktopManager.plasma6.enable;
 in
 {
-  imports = lib.optionals withPlasma [
+  imports = [
+    ./ghostty.nix
+  ]
+  ++ lib.optionals withPlasma [
     ./plasma.nix
   ];
 
diff --git a/home/mhelton/packages.nix b/home/mhelton/packages.nix
index 0ffc5b84..26effdf5 100644
--- a/home/mhelton/packages.nix
+++ b/home/mhelton/packages.nix
@@ -8,7 +8,6 @@
   imports = [
     inputs.nixvim.homeModules.nixvim
     ./kitty.nix
-    ./ghostty.nix
   ];
 
   home.packages = with pkgs; [
diff --git a/hosts/common/darwin.nix b/hosts/common/darwin.nix
index e03bb2c7..66fbc0e2 100644
--- a/hosts/common/darwin.nix
+++ b/hosts/common/darwin.nix
@@ -1,6 +1,5 @@
 {
   inputs,
-  config,
   pkgs,
   ...
 }:
@@ -38,9 +37,12 @@
     optimise.automatic = true;
   };
 
+  users.knownUsers = [ "mhelton" ];
   users.users = {
     mhelton = {
       home = "/Users/mhelton";
+      shell = pkgs.fish;
+      uid = 501;
     };
   };
 
@@ -51,6 +53,8 @@
     wget
   ];
 
+  services.tailscale.enable = true;
+
   nix-homebrew = {
     enable = true;
     enableRosetta = true;
@@ -74,12 +78,10 @@
     casks = [
       "rectangle"
       "firefox"
-      "aldente"
-      "deskpad"
     ];
   };
 
-  programs.zsh.enable = true;
+  programs.fish.enable = true;
 
   security.pam.services.sudo_local.touchIdAuth = true;
 
@@ -94,13 +96,11 @@
       tilesize = 57;
       show-recents = false;
       persistent-apps = [
-        "/System/Applications/Launchpad.app"
+        "/System/Applications/Apps.app"
         "/Applications/Firefox.app"
         "/System/Applications/Messages.app"
         "/System/Applications/FaceTime.app"
-        "/Applications/Mimestream.app"
         "${pkgs.kitty}/Applications/kitty.app"
-        "/Applications/Obsidian.app"
         "/System/Applications/System\ Settings.app"
       ];
     };
@@ -114,9 +114,10 @@
       "NSAutomaticSpellingCorrectionEnabled" = false;
       "AppleInterfaceStyleSwitchesAutomatically" = true;
     };
+    WindowManager = {
+      EnableStandardClickToShowDesktop = false;
+      StandardHideWidgets = true;
+    };
   };
 
-  system.activationScripts.postActivation.text = ''
-    dscl . -create '/Users/${builtins.elemAt (builtins.attrNames config.users.users) 0}' UserShell '${pkgs.zsh}/bin/zsh'
-  '';
 }
diff --git a/hosts/mhelton-mbp14/default.nix b/hosts/mhelton-mbp14/default.nix
new file mode 100644
index 00000000..1453e005
--- /dev/null
+++ b/hosts/mhelton-mbp14/default.nix
@@ -0,0 +1,21 @@
+{ ... }:
+{
+  imports = [
+    ../common/darwin.nix
+  ];
+
+  system.stateVersion = 7;
+
+  networking.hostName = "mhelton-mbp14";
+
+  homebrew.casks = [
+    "dbeaver-community"
+    "microsoft-remote-desktop"
+    "slack"
+  ];
+
+  system.defaults.dock.persistent-apps = [
+    "/Applications/Slack.app"
+  ];
+
+}