diff --git a/.config/nixos/flake.nix b/.config/nixos/flake.nix
index 49dfc11..5a35006 100755
--- a/.config/nixos/flake.nix
+++ b/.config/nixos/flake.nix
@@ -1,38 +1,28 @@
 {
-  description = "System flake";
+  description = "System flake with automatic hostname detection";
+
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     stylix.url = "github:danth/stylix";
     stylix.inputs.nixpkgs.follows = "nixpkgs";
   };
-  outputs = { self, nixpkgs, ... }@inputs: {
+
+  outputs = { self, nixpkgs, ... }@inputs: let
+    system = "x86_64-linux";
+    hostname = builtins.getEnv "HOSTNAME";
+  in
+  {
     nixosConfigurations = {
-      mecca = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs;};
+      "${hostname}" = nixpkgs.lib.nixosSystem {
+        inherit system;
+        specialArgs = { inherit inputs; };
         modules = [
-          ./laptop/mecca/configuration.nix
+          ./common.nix
+          ./${hostname}/configuration.nix
+          ./${hostname}/hardware-configuration.nix
           inputs.stylix.nixosModules.stylix
         ];
       };
-      syntheticnexus = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = {inherit inputs;};
-        modules = [
-          ./laptop/syntheticnexus/configuration.nix
-          inputs.stylix.nixosModules.stylix
-        ];
-      };
-
-    }; 
-
-    /*nixpkgs.lib.nixosSystem {
-      specialArgs = {inherit inputs;};
-      modules = [
-        ./configuration.nix 
-	      inputs.stylix.nixosModules.stylix
-      ];
     };
-    */
   };
 }
diff --git a/.config/nixos/laptop/mecca/bg.jpg b/.config/nixos/mecca/bg.jpg
similarity index 100%
rename from .config/nixos/laptop/mecca/bg.jpg
rename to .config/nixos/mecca/bg.jpg
diff --git a/.config/nixos/laptop/mecca/configuration.nix b/.config/nixos/mecca/configuration.nix
similarity index 99%
rename from .config/nixos/laptop/mecca/configuration.nix
rename to .config/nixos/mecca/configuration.nix
index ea4c90f..9de416f 100644
--- a/.config/nixos/laptop/mecca/configuration.nix
+++ b/.config/nixos/mecca/configuration.nix
@@ -143,7 +143,7 @@
   services.syncthing.enable = true;
 
   environment.systemPackages = with pkgs; [
-    home-manager # For using Nix Home Manager
+    # home-manager # For using Nix Home Manager
     zsh # Default user shell
     minecraftia # font
     jetbrains-mono # font
diff --git a/.config/nixos/laptop/mecca/hardware-configuration.nix b/.config/nixos/mecca/hardware-configuration.nix
similarity index 100%
rename from .config/nixos/laptop/mecca/hardware-configuration.nix
rename to .config/nixos/mecca/hardware-configuration.nix
diff --git a/.config/nixos/laptop/syntheticnexus/bg.jpg b/.config/nixos/syntheticnexus/bg.jpg
similarity index 100%
rename from .config/nixos/laptop/syntheticnexus/bg.jpg
rename to .config/nixos/syntheticnexus/bg.jpg
diff --git a/.config/nixos/laptop/syntheticnexus/configuration.nix b/.config/nixos/syntheticnexus/configuration.nix
similarity index 100%
rename from .config/nixos/laptop/syntheticnexus/configuration.nix
rename to .config/nixos/syntheticnexus/configuration.nix
diff --git a/.config/nixos/laptop/syntheticnexus/hardware-configuration.nix b/.config/nixos/syntheticnexus/hardware-configuration.nix
similarity index 100%
rename from .config/nixos/laptop/syntheticnexus/hardware-configuration.nix
rename to .config/nixos/syntheticnexus/hardware-configuration.nix