diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index 80efe4e..fc95cc9 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -68,4 +68,6 @@
       dennis = import ../../home/darwin.nix;
     };
   };
+
+  nix.enable = false;
 }
diff --git a/hosts/dnsc-work/default.nix b/hosts/dnsc-work/default.nix
index 04d5ae3..d90580c 100644
--- a/hosts/dnsc-work/default.nix
+++ b/hosts/dnsc-work/default.nix
@@ -7,68 +7,28 @@
 {
   imports = [
     inputs.home-manager.darwinModules.home-manager
-    ../../modules/aerospace
+    outputs.nixosModules.base
+    outputs.nixosModules.macos
+    outputs.nixosModules.homebrew
+    outputs.nixosModules.aerospace
   ];
 
-  # Setting the user
+  # Device & user-specific settings
   networking.hostName = "dnsc-work";
   networking.computerName = "dnsc-work";
-
   users.users."dennis" = {
     home = "/Users/dennis";
     description = "Dennis Schoepf";
   };
-
-  nixpkgs.config.allowUnfree = true;
+  nix.settings.trusted-users = [ "dennis" ];
 
   # System Packages
   environment.systemPackages = with pkgs; [
-    git
-    btop
-    fish
-    ripgrep
-    fzf
-    fd
-    sd
-    bat
-    neovim
-    just
-    tldr
-    fortune
-    stylua
-    typescript-language-server
-    vscode-langservers-extracted
-    tailwindcss-language-server
-    lua-language-server
-    prettierd
-    eslint_d
-    atuin
-    nil
-    nurl
-    shellcheck
-    lazygit
-    ffmpeg
-    tree-sitter
-    zoxide
-    sqlite
-    fnm
-    imagemagick
     circumflex
     gh
     # rsync
   ];
 
-  # Homebrew
-  homebrew = {
-    user = "dennis";
-    enable = true;
-
-    onActivation = {
-      autoUpdate = true;
-      upgrade = true;
-      cleanup = "zap";
-    };
-
     masApps = {
       Bitwarden = 1352778147;
       Wireguard = 1451685025;
@@ -76,7 +36,6 @@
     };
 
     brews = [
-      "mas"
       "watchman"
       "pnpm"
       "pkg-config"
@@ -96,15 +55,6 @@
     casks = [
       "arc"
       "microsoft-teams"
-      "tailscale"
-      "font-victor-mono"
-      "font-victor-mono-nerd-font"
-      "vlc"
-      "wezterm"
-      "hiddenbar"
-      "syncthing"
-      "eurkey"
-      "karabiner-elements"
       "wezterm"
       "1password"
       "1password-cli"
@@ -112,8 +62,6 @@
       "zulu@17"
       "postman"
       "docker-desktop"
-      "raycast"
-      "spotify"
       "google-chrome"
     ];
   };
@@ -121,69 +69,6 @@
   # Shells
   environment.shells = [ pkgs.fish ];
 
-  # System settings
-  system = {
-    primaryUser = "dennis";
-    stateVersion = 5;
-    activationScripts.postActivation.text = ''
-      /System/Library/PrivateFrameworks/SystemAdministration.framework/Resources/activateSettings -u
-    '';
-
-    defaults = {
-      smb.NetBIOSName = "dnsc-work";
-
-      NSGlobalDomain."com.apple.swipescrolldirection" = false;
-
-      dock = {
-        autohide = true;
-        autohide-delay = 0.01;
-        autohide-time-modifier = 0.01;
-        expose-group-apps = true;
-        launchanim = false;
-        minimize-to-application = true;
-        orientation = "right";
-        show-recents = false;
-        persistent-apps = [
-          "/Applications/Arc.app"
-          "/Applications/WezTerm.app"
-          "/Applications/Microsoft Teams.app"
-          "/System/Applications/System Settings.app/"
-        ];
-        persistent-others = [
-          "/Users/dennis/Downloads"
-        ];
-      };
-
-      finder = {
-        AppleShowAllExtensions = true;
-        CreateDesktop = false;
-        FXEnableExtensionChangeWarning = false;
-        FXPreferredViewStyle = "clmv";
-        ShowPathbar = true;
-        ShowStatusBar = true;
-      };
-
-      loginwindow = {
-        LoginwindowText = "λ dnsc-work (powered by nix-darwin)";
-      };
-
-      menuExtraClock = {
-        Show24Hour = true;
-        ShowDate = 0;
-      };
-
-      screencapture = {
-        location = "/Users/dennis/Downloads";
-        target = "file";
-      };
-
-      spaces.spans-displays = false;
-    };
-  };
-
-  # Add ability to used TouchID for sudo authentication
-  security.pam.services.sudo_local.touchIdAuth = true;
-
   # Home Manager Setup
   home-manager = {
     extraSpecialArgs = { inherit inputs outputs; };