diff --git a/flake.nix b/flake.nix
index 61d31e5..6c1cfd3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,26 +48,12 @@
           }
         ];
       };
-      workstation-vm = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs outputs;};
-        # > Our main nixos configuration file <
-        modules = [
-          ./hosts/workstation-vm/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.gabe = import ./hosts/workstation-vm/home.nix;
-            home-manager.extraSpecialArgs = {inherit inputs outputs;};
-          }
-        ];
-      };
+      workstation-vm = import ./hosts/workstation-vm {inherit inputs outputs;};
     };
 
     # Standalone home-manager configuration entrypoint
     # Available through 'home-manager --flake .#your-username@your-hostname'
-    homeConfigurations = {
+    homeConfiguration = {
       "gabe@archlaptop" = home-manager.lib.homeManagerConfiguration {
         pkgs = nixpkgs.legacyPackages.x86_64-linux; # Home-manager requires 'pkgs' instance
         extraSpecialArgs = {inherit inputs outputs;};
diff --git a/hosts/workstation-vm/configuration.nix b/hosts/workstation-vm/configuration.nix
deleted file mode 100644
index 9b4914f..0000000
--- a/hosts/workstation-vm/configuration.nix
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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’).
-{
-  config,
-  pkgs,
-  ...
-}: {
-  imports = [
-    # Include the results of the hardware scan.
-    ./hardware-configuration.nix
-  ];
-
-  # Bootloader.
-  boot.loader.systemd-boot.enable = true;
-  boot.loader.efi.canTouchEfiVariables = true;
-
-  networking.hostName = "workstation-vm"; # 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";
-  };
-
-  nix = {
-    package = pkgs.nixFlakes;
-    extraOptions = ''
-      experimental-features = nix-command flakes
-    '';
-  };
-
-  # Enable the X11 windowing system.
-  services.xserver.enable = true;
-
-  # Enable the Cinnamon Desktop Environment.
-  services.xserver.displayManager.lightdm.enable = true;
-  services.xserver.desktopManager.cinnamon.enable = true;
-
-  # Configure keymap in X11
-  services.xserver = {
-    xkb.layout = "us";
-    xkb.variant = "";
-  };
-
-  # 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.gabe = {
-    isNormalUser = true;
-    description = "Gabe Venberg";
-    shell = pkgs.nushell;
-    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
-  ];
-
-  # 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;
-  # };
-
-  # List services that you want to enable:
-
-  # Enable the OpenSSH daemon.
-  services.openssh.enable = true;
-
-  # 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.11"; # Did you read the comment?
-}
diff --git a/hosts/workstation-vm/default.nix b/hosts/workstation-vm/default.nix
new file mode 100644
index 0000000..b8fa3cc
--- /dev/null
+++ b/hosts/workstation-vm/default.nix
@@ -0,0 +1,110 @@
+# 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’).
+{
+  inputs,
+  outputs,
+  ...
+}:
+inputs.nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  specialArgs = {inherit inputs outputs;};
+  # > Our main nixos configuration file <
+  modules = [
+    inputs.home-manager.nixosModules.home-manager
+    ./hardware-configuration.nix
+    ./home.nix
+    ../../modules/commonopts.nix
+    ../../modules/nixos/common.nix
+    ../../modules/nixos/printing.nix
+    ../../modules/both/sound.nix
+    ../../modules/both/networking.nix
+    ({
+      config,
+      pkgs,
+      ...
+    }: {
+      host = {
+        enable-speech = true;
+        user = "gabe";
+        gui.enable = true;
+        nvim = {
+          enable-lsp = true;
+          enable-treesitter = true;
+        };
+        git = {
+          profile = {
+            name = "Gabe Venberg";
+            email = "gabevenberg@gmail.com";
+          };
+          workProfile.enable = false;
+        };
+      };
+      networking.hostName = "workstation-vm"; # Define your hostname.
+      # 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 Cinnamon Desktop Environment.
+      services.xserver.displayManager.lightdm.enable = true;
+      services.xserver.desktopManager.cinnamon.enable = true;
+
+      # Configure keymap in X11
+      services.xserver = {
+        xkb.layout = "us";
+        xkb.variant = "";
+      };
+
+      # Define a user account. Don't forget to set a password with ‘passwd’.
+      users.users.${config.host.user} = {
+        isNormalUser = true;
+        description = "Gabe Venberg";
+        shell = pkgs.nushell;
+        extraGroups = ["wheel"];
+        packages = with pkgs; [
+          firefox
+          #  thunderbird
+        ];
+     };
+
+      home-manager.users.${config.host.user} = import ./home.nix;
+      home-manager.useGlobalPkgs = true;
+      home-manager.useUserPackages = true;
+      home-manager.extraSpecialArgs = {inherit inputs outputs;};
+
+      # Enable the OpenSSH daemon.
+      services.openssh.enable = true;
+
+      # 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.11"; # Did you read the comment?
+    })
+  ];
+}
diff --git a/hosts/workstation-vm/home.nix b/hosts/workstation-vm/home.nix
index 1213199..f8a375c 100644
--- a/hosts/workstation-vm/home.nix
+++ b/hosts/workstation-vm/home.nix
@@ -5,22 +5,6 @@
   lib,
   ...
 }: {
-  # machine specific options
-  host = {
-    enable-speech = true;
-    nvim = {
-      enable-lsp = true;
-      enable-treesitter = true;
-    };
-    git = {
-      profile = {
-        name = "Gabe Venberg";
-        email = "gabevenberg@gmail.com";
-      };
-      workProfile.enable = false;
-    };
-  };
-
   imports = [
     ../../modules/home-manager/terminal
     ../../modules/home-manager/nvim
diff --git a/modules/both/i3/default.nix b/modules/both/i3/default.nix
new file mode 100644
index 0000000..e2c1137
--- /dev/null
+++ b/modules/both/i3/default.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  home.stateVersion = "23.11"; # Please read the comment before changing.
+
+  # Let Home Manager install and manage itself.
+  programs.home-manager.enable = true;
+
+  # enable flakes
+  nix =
+    lib.mkIf config.targets.genericLinux.enable
+    {
+      package = pkgs.nix;
+      settings.experimental-features = ["nix-command" "flakes"];
+      settings.max-jobs = "auto";
+      gc.automatic = true;
+    };
+}
diff --git a/modules/both/networking.nix b/modules/both/networking.nix
new file mode 100644
index 0000000..1410f8a
--- /dev/null
+++ b/modules/both/networking.nix
@@ -0,0 +1,9 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Enable networking
+  networking.networkmanager.enable = true;
+  users.users.${config.host.user}.extraGroups = ["networkmanager"];
+}
diff --git a/modules/both/sound.nix b/modules/both/sound.nix
new file mode 100644
index 0000000..474094a
--- /dev/null
+++ b/modules/both/sound.nix
@@ -0,0 +1,16 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # 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;
+  };
+}
diff --git a/modules/commonopts.nix b/modules/commonopts.nix
new file mode 100644
index 0000000..f17382b
--- /dev/null
+++ b/modules/commonopts.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+  options = {
+    host = {
+      user = lib.mkOption {
+        type = lib.types.str;
+        description = "Primary human user";
+      };
+      fullName = lib.mkOption {
+        type = lib.types.str;
+        description = "Primary human users long name";
+      };
+      gui.enable = lib.mkEnableOption {
+        description = "enable GUI";
+        default = false;
+      };
+    };
+  };
+}
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index e2c1137..2f03127 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -6,10 +6,10 @@
 }: {
   home.stateVersion = "23.11"; # Please read the comment before changing.
 
-  # Let Home Manager install and manage itself.
-  programs.home-manager.enable = true;
+  # Let Home Manager install and manage itself on non-nixos systems.
+  programs.home-manager.enable = config.targets.genericLinux.enable;
 
-  # enable flakes
+  # enable flakes on non-nixos systems
   nix =
     lib.mkIf config.targets.genericLinux.enable
     {
diff --git a/modules/home-manager/i3/default.nix b/modules/home-manager/i3/default.nix
new file mode 100644
index 0000000..d9220f8
--- /dev/null
+++ b/modules/home-manager/i3/default.nix
@@ -0,0 +1,7 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}: {
+}
diff --git a/modules/nixos/common.nix b/modules/nixos/common.nix
new file mode 100644
index 0000000..2e86582
--- /dev/null
+++ b/modules/nixos/common.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+  nix = {
+    package = pkgs.nixFlakes;
+    extraOptions = ''
+      experimental-features = nix-command flakes
+    '';
+  };
+
+  # Allow unfree packages
+  nixpkgs.config.allowUnfree = true;
+
+  # packages that should be on every system.
+  environment.systemPackages = with pkgs; [
+    vi # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
+  ];
+}
diff --git a/modules/nixos/printing.nix b/modules/nixos/printing.nix
new file mode 100644
index 0000000..927e836
--- /dev/null
+++ b/modules/nixos/printing.nix
@@ -0,0 +1,8 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Enable CUPS to print documents.
+  services.printing.enable = true;
+}
diff --git a/modules/nixos/touchpad.nix b/modules/nixos/touchpad.nix
new file mode 100644
index 0000000..b6c8808
--- /dev/null
+++ b/modules/nixos/touchpad.nix
@@ -0,0 +1,8 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  # Enable touchpad support (enabled default in most desktopManager).
+  services.xserver.libinput.enable = true;
+}
diff --git a/modules/nixos/wireless.nix b/modules/nixos/wireless.nix
new file mode 100644
index 0000000..6f4a74b
--- /dev/null
+++ b/modules/nixos/wireless.nix
@@ -0,0 +1,7 @@
+{
+  config,
+  pkgs,
+  ...
+}: {
+  networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
+}