Refactor how things are imported

Author: RossSmyth

common.nix renamed to default.nix

@@ -3,8 +3,13 @@
   lib,
   config,
   pkgs,
+  hostname,
   ...
 }: {
+  imports = [
+    (import ./${hostname})
+  ];
+  
   nixpkgs = {
     config = {
       allowUnfree = true;
@@ -33,7 +38,8 @@
       options = "--delete-older-than 7d";
     };
   };
-
+  networking.hostName = hostname;
+  
   time.timeZone = "America/Detroit";
   systemd.coredump.enable = true;
 

desktop/system.nix renamed to desktop/default.nix

@@ -6,6 +6,7 @@
   ...
 }: {
   imports = [
+    ./hardware-configuration.nix
     inputs.nixos-wsl.nixosModules.default
     {
       wsl.enable = true;

flake.nix

@@ -48,18 +48,15 @@
     }:
       nixpkgs.lib.nixosSystem {
         system = target;
-        specialArgs = {inherit inputs;};
+        specialArgs = {inherit inputs; inherit hostname;};
         modules =
           [
-            {networking.hostName = hostname;}
-            ./common.nix
-            ./${hostname}/hardware-configuration.nix
-            ./${hostname}/system.nix
+            ./.
             home-manager.nixosModules.home-manager
             {
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
-              home-manager.users.rsmyth = import ./home-manager/home.nix;
+              home-manager.users.rsmyth = import ./home-manager;
               home-manager.extraSpecialArgs = {inherit inputs;};
             }
           ]

home-manager/home.nix renamed to home-manager/default.nix

@@ -10,11 +10,6 @@
     inputs.nix-index-database.hmModules.nix-index
   ];
 
-  nixpkgs = {
-    overlays = [
-    ];
-  };
-
   home = {
     username = "rsmyth";
     homeDirectory = "/home/rsmyth";
@@ -101,7 +96,7 @@
         nxswitch = "sudo nixos-rebuild switch --flake ${config.xdg.configHome}/nix";
         nxbuild = "sudo nixos-rebuild boot --flake ${config.xdg.configHome}/nix";
         nxedit = "${config.home.sessionVariables.EDITOR} ${config.xdg.configHome}/nix";
-        getLargest = "${lib.getExe pkgs.fd} -t file . --exec ls -s | sort -nr | head-n20";
+        getLargest = "${lib.getExe pkgs.fd} -t file . --exec ls -s | sort -nr | head -n20";
         dev = "nix develop --command ${lib.getExe pkgs.fish}";
         scratch = ''systemd-run --property=PrivateTmp=true --description "scratch shell" --user --collect --shell --working-dir "/var/tmp"'';
       };

work/system.nix renamed to work/default.nix

@@ -6,6 +6,7 @@
   ...
 }: {
   imports = [
+    ./hardware-configuration.nix
     inputs.nixos-wsl.nixosModules.default
     {
       wsl.enable = true;