diff --git a/flake.nix b/flake.nix
index f83a5cb..b9ba9f3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -121,7 +121,6 @@
         ./modules/net/services/avahi.nix
         ./modules/net/services/fail2ban.nix
         ./modules/net/services/networkmanager.nix
-        ./modules/net/services/printing.nix
         ./modules/net/services/tailscale.nix
         
         ./modules/sys/compat.nix
@@ -147,12 +146,85 @@
         ./modules/sys/users/k3t.nix
 
         ./hosts/NixNAS/configuration.nix
-        spicetify-nix.nixosModules.spicetify
         home-manager.nixosModules.home-manager
         {
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
-          home-manager.users.k3t = ./home/desktop.nix;
+          home-manager.users.k3t = ./home/server.nix;
+        }
+      ];
+
+      "NixServe" = mkHost "x86_64-linux" [
+        ./modules/net/services/avahi.nix
+        ./modules/net/services/fail2ban.nix
+        ./modules/net/services/networkmanager.nix
+        ./modules/net/services/tailscale.nix
+        
+        ./modules/sys/compat.nix
+        ./modules/sys/firewall.nix
+        
+        ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/root-btrfs.nix
+        ./modules/sys/fs/mounts/swap.nix
+
+        ./modules/sys/hw/boot.nix
+        ./modules/sys/hw/hyperv.nix
+        
+        ./modules/sys/nix.nix
+        ./modules/sys/perf.nix
+        ./modules/sys/pkgs.nix
+        ./modules/sys/rc/openssh.nix
+        ./modules/sys/security.nix
+        ./modules/sys/shell.nix
+        ./modules/sys/stateversion.nix
+        ./modules/sys/sysctl.nix
+        ./modules/sys/time.nix
+        ./modules/sys/users/k3t.nix
+
+        ./hosts/NixServe/configuration.nix
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.k3t = ./home/server.nix;
+        }
+      ];
+
+      "NixGame" = mkHost "x86_64-linux" [
+        ./modules/net/services/avahi.nix
+        ./modules/net/services/fail2ban.nix
+        ./modules/net/services/networkmanager.nix
+        ./modules/net/services/tailscale.nix
+        
+        ./modules/sys/compat.nix
+        ./modules/sys/firewall.nix
+        
+        ./modules/sys/fs/btrfs.nix
+        ./modules/sys/fs/mounts/efi.nix
+        ./modules/sys/fs/mounts/root-btrfs.nix
+        ./modules/sys/fs/mounts/swap.nix
+
+        ./modules/sys/hw/boot.nix
+        ./modules/sys/hw/hyperv.nix
+        
+        ./modules/sys/nix.nix
+        ./modules/sys/perf.nix
+        ./modules/sys/pkgs.nix
+        ./modules/sys/rc/openssh.nix
+        ./modules/sys/security.nix
+        ./modules/sys/shell.nix
+        ./modules/sys/stateversion.nix
+        ./modules/sys/sysctl.nix
+        ./modules/sys/time.nix
+        ./modules/sys/users/k3t.nix
+
+        ./hosts/NixGame/configuration.nix
+        home-manager.nixosModules.home-manager
+        {
+          home-manager.useGlobalPkgs = true;
+          home-manager.useUserPackages = true;
+          home-manager.users.k3t = ./home/server.nix;
         }
       ];
 
diff --git a/hosts/NixGame/configuration.nix b/hosts/NixGame/configuration.nix
new file mode 100644
index 0000000..b9e29b0
--- /dev/null
+++ b/hosts/NixGame/configuration.nix
@@ -0,0 +1,19 @@
+# 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
+    ];
+
+  networking.hostName = "NixGame";
+
+  users.users.k3t = {
+    packages = with pkgs; [
+    ];
+  };
+}
diff --git a/hosts/NixGame/hardware-configuration.nix b/hosts/NixGame/hardware-configuration.nix
new file mode 100644
index 0000000..6880f28
--- /dev/null
+++ b/hosts/NixGame/hardware-configuration.nix
@@ -0,0 +1,18 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/NixServe/configuration.nix b/hosts/NixServe/configuration.nix
new file mode 100644
index 0000000..81a02ca
--- /dev/null
+++ b/hosts/NixServe/configuration.nix
@@ -0,0 +1,19 @@
+# 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
+    ];
+
+  networking.hostName = "NixServe";
+
+  users.users.k3t = {
+    packages = with pkgs; [
+    ];
+  };
+}
diff --git a/hosts/NixServe/hardware-configuration.nix b/hosts/NixServe/hardware-configuration.nix
new file mode 100644
index 0000000..6880f28
--- /dev/null
+++ b/hosts/NixServe/hardware-configuration.nix
@@ -0,0 +1,18 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}