nixos config refactor

nixos/configs/default.nix

@@ -24,20 +24,22 @@ let
       hardware.cpu.intel.updateMicrocode = lib.mkForce false;
     };
   };
-  essential = [ hardwareConfigurations.nova inputs.hosts.nixosModule inputs.home-manager.nixosModules.default ] ++ (with mods; [ grub base sound wayland security ivand wireless wireguard ]);
+  essential = with mods; [ grub base security wireless wireguard ];
-  systemWithModules = modules: withSystem system (ctx@{ config, inputs', pkgs, ... }: inputs.nixpkgs.lib.nixosSystem {
+  desktop = with mods; [ sound wayland ];
+  configWithModules = { hardware, modules }: withSystem system (ctx@{ config, inputs', pkgs, ... }: inputs.nixpkgs.lib.nixosSystem {
     specialArgs = {
       inherit inputs inputs' pkgs;
       packages = config.packages;
     };
-    modules = modules;
+    modules = [ hardware ] ++ modules;
   });
+  novaConfig = mods: configWithModules { hardware = hardwareConfigurations.nova; modules = essential ++ desktop ++ mods; };
 in
 {
   flake.nixosConfigurations = {
-    nixos = systemWithModules essential;
+    nixos = novaConfig [ mods.ivand ];
-    music = systemWithModules (essential ++ [ inputs.musnix.nixosModules.musnix mods.music ]);
+    music = novaConfig (with mods; [ music ivand ]);
-    nonya = systemWithModules (essential ++ (with mods; [ anon cryptocurrency ]));
+    nonya = novaConfig (with mods; [ anon cryptocurrency ivand ]);
-    ai = systemWithModules (essential ++ (with mods; [ ai ]));
+    ai = novaConfig (with mods; [ ai ivand ]);
   };
 }

nixos/modules/default.nix

@@ -1,4 +1,4 @@
-top@{ moduleWithSystem, ... }: {
+top@{ inputs, moduleWithSystem, ... }: {
   flake.nixosModules = {
     grub = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
       boot = {
@@ -13,6 +13,7 @@ top@{ moduleWithSystem, ... }: {
       };
     });
     base = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
+      imports = [ inputs.hosts.nixosModule ];
       system.stateVersion = top.config.flake.stateVersion;
       nix = { extraOptions = ''experimental-features = nix-command flakes''; };
       i18n.supportedLocales = [ "all" ];
@@ -35,6 +36,7 @@ top@{ moduleWithSystem, ... }: {
       environment.systemPackages = with pkgs; [ pwvucontrol ];
     });
     music = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }: {
+      imports = [ inputs.musnix.nixosModules.musnix ];
       environment.systemPackages = with pkgs; [ guitarix ];
       services.pipewire = {
         jack.enable = true;
@@ -128,6 +130,7 @@ top@{ moduleWithSystem, ... }: {
     };
     ivand = moduleWithSystem (toplevel@{ ... }: perSystem@{ pkgs, ... }:
       let homeMods = top.config.flake.homeManagerModules; in {
+        imports = [ inputs.home-manager.nixosModules.default ];
         home-manager = {
           backupFileExtension = "bak";
           useUserPackages = true;