diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix
index 9680c91..804768e 100644
--- a/home/features/cli/fish.nix
+++ b/home/features/cli/fish.nix
@@ -36,6 +36,7 @@ in
       ssh = "TERM=xterm command ssh $argv";
       # Rebuild home-manager
       switch-home = "home-manager switch -b backup --flake ${config.home.homeDirectory}/.dotfiles#$USER@$(hostname -s)";
+      switch-nix = "sudo nixos-rebuild switch --flake ${config.home.homeDirectory}/.dotfiles";
     };
 
     interactiveShellInit =
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
new file mode 100644
index 0000000..be4bd70
--- /dev/null
+++ b/hosts/common/global/default.nix
@@ -0,0 +1,37 @@
+{ inputs, outputs,... }: {
+  imports = [
+    inputs.home-manager.nixosModules.home-manager
+    ./fish.nix
+    ./tailscale.nix
+  ] ++ (builtins.attrValues outputs.nixosModules);
+
+  home-manager.extraSpecialArgs = { inherit inputs outputs; };
+
+  nixpkgs = {
+    overlays = builtins.attrValues outputs.overlays;
+    config = {
+      allowUnfree = true;
+    };
+  };
+
+  environment.enableAllTerminfo = true;
+
+  hardware.enableRedistributableFirmware = true;
+  networking.domain = "vim.wtf";
+
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    extraLocaleSettings = {
+      LC_ADDRESS = "en_US.UTF-8";
+      LC_IDENTIFICATION = "en_US.UTF-8";
+      LC_MEASUREMENT = "en_US.UTF-8";
+      LC_MONETARY = "en_US.UTF-8";
+      LC_NAME = "en_US.UTF-8";
+      LC_NUMERIC = "en_US.UTF-8";
+      LC_PAPER = "en_US.UTF-8";
+      LC_TELEPHONE = "en_US.UTF-8";
+      LC_TIME = "en_US.UTF-8";
+    };
+  };
+
+}
\ No newline at end of file
diff --git a/hosts/common/global/fish.nix b/hosts/common/global/fish.nix
new file mode 100644
index 0000000..7ad7362
--- /dev/null
+++ b/hosts/common/global/fish.nix
@@ -0,0 +1,10 @@
+{
+  programs.fish = {
+    enable = true;
+    vendor = {
+      completions.enable = true;
+      config.enable = true;
+      functions.enable = true;
+    };
+  };
+}
\ No newline at end of file
diff --git a/hosts/common/global/tailscale.nix b/hosts/common/global/tailscale.nix
new file mode 100644
index 0000000..6703dfa
--- /dev/null
+++ b/hosts/common/global/tailscale.nix
@@ -0,0 +1,7 @@
+{ lib, ... }:
+{
+  services.tailscale = {
+    enable = true;
+    useRoutingFeatures = lib.mkDefault "client";
+  };
+}
\ No newline at end of file
diff --git a/hosts/common/optional/docker.nix b/hosts/common/optional/docker.nix
new file mode 100644
index 0000000..06d1c37
--- /dev/null
+++ b/hosts/common/optional/docker.nix
@@ -0,0 +1,5 @@
+{
+  virtualisation.docker = {
+    enable = true;
+  };
+}
\ No newline at end of file
diff --git a/hosts/common/optional/tailscale-exit-node.nix b/hosts/common/optional/tailscale-exit-node.nix
new file mode 100644
index 0000000..6332e05
--- /dev/null
+++ b/hosts/common/optional/tailscale-exit-node.nix
@@ -0,0 +1,6 @@
+{
+  imports = [ ../global/tailscale.nix ];
+  services.tailscale = {
+    useRoutingFeatures = "both";
+  };
+}
\ No newline at end of file
diff --git a/hosts/common/optional/wireshark.nix b/hosts/common/optional/wireshark.nix
new file mode 100644
index 0000000..ed52684
--- /dev/null
+++ b/hosts/common/optional/wireshark.nix
@@ -0,0 +1,5 @@
+{
+  programs.wireshark = {
+    enable = true;
+  };
+}
\ No newline at end of file
diff --git a/hosts/common/users/john/default.nix b/hosts/common/users/john/default.nix
new file mode 100644
index 0000000..ef941c9
--- /dev/null
+++ b/hosts/common/users/john/default.nix
@@ -0,0 +1,27 @@
+{ pkgs, config, ... }:
+let ifTheyExist = groups: builtins.filter (group: builtins.hasAttr group config.users.groups) groups;
+in
+{
+  users.users.john = {
+    isNormalUser = true;
+    shell = pkgs.fish;
+    extraGroups = [
+      "wheel"
+      "video"
+      "audio"
+    ] ++ ifTheyExist [
+      "network"
+      "wireshark"
+      "mysql"
+      "docker"
+      "podman"
+      "libvirtd"
+      "networkmanager"
+    ];
+
+    packages = [ pkgs.home-manager ];
+  };
+
+  home-manager.users.john = import ../../../../home/${config.networking.hostName}.nix;
+
+}
\ No newline at end of file
diff --git a/hosts/pixnix/default.nix b/hosts/pixnix/default.nix
index c7d3ac6..497d4bb 100644
--- a/hosts/pixnix/default.nix
+++ b/hosts/pixnix/default.nix
@@ -1,129 +1,32 @@
-# Edit this configuration file to define what should be installed on
-# your system.  Help is available in the configuration.nix(5) man page
-# and in the NixOS manual (accessible by running ‘nixos-help’).
+{ pkgs, inputs, ... }: {
+  imports = [
+    inputs.hardware.nixosModules.common-cpu-intel
+    inputs.hardware.nixosModules.common-pc-ssd
 
-{ config, pkgs, ... }:
+    ./hardware-configuration.nix
+    ./services
 
-{
-  imports =
-    [ # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+    ../common/global
+    ../common/users/john
 
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "pixnix"; # Define your hostname.
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-
-  # Configure network proxy if necessary
-  # networking.proxy.default = "http://user:password@proxy:port/";
-  # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
-
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "America/Chicago";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the GNOME Desktop Environment.
-  services.xserver.displayManager.gdm.enable = true;
-  services.xserver.desktopManager.gnome.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    layout = "us";
-    xkbVariant = "";
-  };
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable sound with pipewire.
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-    # If you want to use JACK applications, uncomment this
-    #jack.enable = true;
-
-    # use the example session manager (no others are packaged yet so this is enabled by default,
-    # no need to redefine it in your config for now)
-    #media-session.enable = true;
-  };
-
-  # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
-
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.john = {
-    isNormalUser = true;
-    description = "john";
-    extraGroups = [ "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-    #  thunderbird
-    ];
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
+    ../common/optional/docker.nix
   ];
 
-  # Some programs need SUID wrappers, can be configured further or are
-  # started in user sessions.
-  # programs.mtr.enable = true;
-  # programs.gnupg.agent = {
-  #   enable = true;
-  #   enableSSHSupport = true;
-  # };
+  boot = {
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
+  };
 
-  # List services that you want to enable:
+  networking = {
+    hostName = "pixnix";
+    # wireless.enable = true;
+    networkmanager.enable = true;
+  };
 
-  # Enable the OpenSSH daemon.
-  # services.openssh.enable = true;
+  time.timeZone = "America/Chicago";
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # This value determines the NixOS release from which the default
-  # settings for stateful data, like file locations and database versions
-  # on your system were taken. It‘s perfectly fine and recommended to leave
-  # this value at the release version of the first install of this system.
-  # Before changing this value read the documentation for this option
-  # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "23.05"; # Did you read the comment?
+  system.stateVersion = "23.05";
 
 }
diff --git a/hosts/pixnix/services/default.nix b/hosts/pixnix/services/default.nix
new file mode 100644
index 0000000..91529ed
--- /dev/null
+++ b/hosts/pixnix/services/default.nix
@@ -0,0 +1,7 @@
+{
+  imports = [
+    ./pipewire.nix
+    ./printing.nix
+    ./xserver.nix
+  ];
+}
\ No newline at end of file
diff --git a/hosts/pixnix/services/pipewire.nix b/hosts/pixnix/services/pipewire.nix
new file mode 100644
index 0000000..76665e1
--- /dev/null
+++ b/hosts/pixnix/services/pipewire.nix
@@ -0,0 +1,11 @@
+{
+  sound.enable = true;
+  hardware.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+}
\ No newline at end of file
diff --git a/hosts/pixnix/services/printing.nix b/hosts/pixnix/services/printing.nix
new file mode 100644
index 0000000..e644f6e
--- /dev/null
+++ b/hosts/pixnix/services/printing.nix
@@ -0,0 +1,5 @@
+{
+  services.printing = {
+    enable = true;
+  };
+}
\ No newline at end of file
diff --git a/hosts/pixnix/services/xserver.nix b/hosts/pixnix/services/xserver.nix
new file mode 100644
index 0000000..bd2b8ba
--- /dev/null
+++ b/hosts/pixnix/services/xserver.nix
@@ -0,0 +1,9 @@
+{
+  services.xserver = {
+    enable = true;
+    displayManager.gdm.enable = true;
+    desktopManager.gnome.enable = true;
+    layout = "us";
+    xkbVariant = "";
+  };
+}
\ No newline at end of file