[Nix] Reorganizes files

flake.nix

@@ -22,19 +22,26 @@
   };
 
   outputs = { self, nixpkgs, ... }@inputs: {
-    nixosConfigurations.drew-desktop = nixpkgs.lib.nixosSystem {
+    nixosConfigurations = {
-      system = "x86_64-linux";
+      drew-desktop = (import ./system/hosts/drew-desktop) {
-      modules = [
+        inherit inputs; 
-        ./configuration.nix
+        inherit self;
-        ./hardware-configuration.nix
+        inherit nixpkgs;
-        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 = 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; };
+    # };
   };
 }

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 = {

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; };
+}