refactor: reorganized

nix/flake.nix

@@ -43,9 +43,9 @@
               };
             };
             system = "x86_64-linux";
-            modules =
-              [
+            modules = [
               ./hosts/${host.name}/configuration.nix
+              ./modules/default.nix
               home-manager.nixosModules.home-manager
               {
                 nix.settings.experimental-features = [
@@ -53,10 +53,7 @@
                   "flakes"
                 ];
               }
-              ]
-              ++ (
-                if builtins.hasAttr "isWSL" host && host.isWSL then [ nixos-wsl.nixosModules.default ] else [ ]
-              );
+            ] ++ (if builtins.hasAttr "isWSL" host then [ nixos-wsl.nixosModules.default ] else [ ]);
           };
         }) hosts
       );

nix/hosts/tux/configuration.nix

@@ -16,7 +16,6 @@
   imports = [
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../../modules/default.nix
   ];
 
   boot.loader.grub = {

nix/hosts/wsl-kumatani/configuration.nix

@@ -11,7 +11,7 @@
 }:
 
 {
-  imports = [ ../../modules/default.nix ];
+  imports = [ ];
 
   wsl.enable = true;
   wsl.defaultUser = "luca";

nix/hosts/wsl-usahara/configuration.nix

@@ -11,7 +11,7 @@
 }:
 
 {
-  imports = [ ../../modules/default.nix ];
+  imports = [ ];
 
   wsl.enable = true;
   wsl.defaultUser = "luca";

nix/modules/commonPackages.nix

@@ -24,6 +24,7 @@
       asciiquarium
     ];
     programs.nix-ld.enable = true;
+    programs.zsh.enable = true;
 
     programs.neovim = {
       enable = true;

nix/modules/hm.nix

@@ -13,6 +13,5 @@
     home-manager.useGlobalPkgs = true;
     home-manager.useUserPackages = true;
     home-manager.users.luca = import ../users/luca/home.nix;
-    programs.zsh.enable = true;
   };
 }