diff --git a/flake.nix b/flake.nix
index 1dbc6a3..67c5189 100644
--- a/flake.nix
+++ b/flake.nix
@@ -22,19 +22,26 @@
   };
 
   outputs = { self, nixpkgs, ... }@inputs: {
-    nixosConfigurations.drew-desktop = nixpkgs.lib.nixosSystem {
-      system = "x86_64-linux";
-      modules = [
-        ./configuration.nix
-        ./hardware-configuration.nix
-        inputs.home-manager.nixosModules.home-manager
-        {
-          home-manager.useGlobalPkgs = true;
-          home-manager.users.drew = import ./home-manager/drew.nix;
-          home-manager.extraSpecialArgs = { inherit inputs; };
-        }
-      ];
-      specialArgs = { inherit inputs; };
+    nixosConfigurations = {
+      drew-desktop = (import ./system/hosts/drew-desktop) {
+        inherit inputs; 
+        inherit self;
+        inherit nixpkgs;
+      };
     };
+    # nixosConfigurations.drew-desktop = nixpkgs.lib.nixosSystem {
+    #   system = "x86_64-linux";
+    #   modules = [
+    #     ./configuration.nix
+    #     ./hardware-configuration.nix
+    #     inputs.home-manager.nixosModules.home-manager
+    #     {
+    #       home-manager.useGlobalPkgs = true;
+    #       home-manager.users.drew = import ./home-manager/drew.nix;
+    #       home-manager.extraSpecialArgs = { inherit inputs; };
+    #     }
+    #   ];
+    #   specialArgs = { inherit inputs; };
+    # };
   };
 }
diff --git a/home-manager/drew.nix b/home-manager/drew.nix
index baab660..c593e05 100644
--- a/home-manager/drew.nix
+++ b/home-manager/drew.nix
@@ -76,6 +76,7 @@
     grim # Screenshot provider
     nwg-look # GTK settings editor
     playerctl # for universal play/pause etc
+    wirelesstools
   ];
 
   xdg.desktopEntries = {
diff --git a/configuration.nix b/system/hosts/drew-desktop/configuration.nix
similarity index 100%
rename from configuration.nix
rename to system/hosts/drew-desktop/configuration.nix
diff --git a/system/hosts/drew-desktop/default.nix b/system/hosts/drew-desktop/default.nix
new file mode 100644
index 0000000..debe950
--- /dev/null
+++ b/system/hosts/drew-desktop/default.nix
@@ -0,0 +1,20 @@
+{ self, nixpkgs, inputs, ... }:
+nixpkgs.lib.nixosSystem {
+  system = "x86_64-linux";
+  modules = [
+    ./configuration.nix
+    ./hardware-configuration.nix
+    inputs.home-manager.nixosModules.home-manager
+    {
+      home-manager.users.drew = { pkgs, inputs, ... }:
+        {
+          imports = [
+            (self + "/home-manager/drew.nix")
+          ];
+        };
+      home-manager.useGlobalPkgs = true;
+      home-manager.extraSpecialArgs = { inherit inputs; };
+    }
+  ];
+  specialArgs = { inherit inputs; };
+}
diff --git a/hardware-configuration.nix b/system/hosts/drew-desktop/hardware-configuration.nix
similarity index 100%
rename from hardware-configuration.nix
rename to system/hosts/drew-desktop/hardware-configuration.nix