diff --git a/flake.nix b/flake.nix
index c4191e7..6cfdf07 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,17 +4,45 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs";
     home-manager.url = "github:nix-community/home-manager";
+    home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
   outputs = { self, nixpkgs, home-manager }: {
-    nixosConfigurations.nixbox = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.nixbox-cwm = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [
         home-manager.nixosModule
+        ({config, ...}: {
+          networking.hostName = "nixbox-cwm";
+        })
         ./configuration.nix
         ./rices/cwm.nix
         ./hardware.nix
       ];
     };
+    nixosConfigurations.nixbox-gnome = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        home-manager.nixosModule
+        ({config, ...}: {
+          networking.hostName = "nixbox-gnome";
+        })
+        ./configuration.nix
+        ./rices/gnome.nix
+        ./hardware.nix
+      ];
+    };
+    nixosConfigurations.nixbox-bspwm = nixpkgs.lib.nixosSystem {
+      system = "x86_64-linux";
+      modules = [
+        home-manager.nixosModule
+        ({config, ...}: {
+          networking.hostName = "nixbox-bspwm";
+        })
+        ./configuration.nix
+        ./rices/bspwm.nix
+        ./hardware.nix
+      ];
+    };
   };
 }
diff --git a/hardware.nix b/hardware.nix
index 02d7a60..329296b 100644
--- a/hardware.nix
+++ b/hardware.nix
@@ -13,7 +13,6 @@
     version = 2;
     device = "/dev/vda";
   };
-  networking.hostName = "nixbox"; # Define your hostname.
 
   boot.initrd.availableKernelModules = [ 
     "ahci"  "xhci_pci" "virtio_pci"