feat: bundle external nixosModules with liminalOS module

flake.nix

@@ -106,6 +106,7 @@
       nixpkgs,
       nix-darwin,
       flake-parts,
+      self,
       ...
     }:
     let
@@ -120,9 +121,13 @@
       ];
       flake = {
         nixosConfigurations = {
-          demeter = buildLiminalOS {
+          demeter = nixpkgs.lib.nixosSystem {
-            inherit inputs nixpkgs;
+            specialArgs = {
-            systemModule = ./reference/hosts/demeter;
+              inherit inputs self;
+            };
+            modules = [
+              ./reference/hosts/demeter
+            ];
           };
           callisto = buildLiminalOS {
             inherit nixpkgs inputs;
@@ -145,6 +150,39 @@
             ./hosts/phobos
           ];
         };
+
+        nixosModules = rec {
+          default = liminalOS;
+          liminalOS = {
+            imports = [
+              inputs.nix-flatpak.nixosModules.nix-flatpak
+              inputs.home-manager.nixosModules.home-manager
+              inputs.nixos-wsl.nixosModules.default
+              inputs.stylix.nixosModules.stylix
+              ./modules/default.nix
+              (
+                { pkgs, ... }:
+                {
+                  home-manager.extraSpecialArgs = {
+                    spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
+                    inherit inputs self;
+                  };
+                }
+              )
+            ];
+          };
+        };
+
+        homeManagerModules = rec {
+          default = liminalOS;
+          liminalOS = {
+            imports = [
+              inputs.nix-index-database.hmModules.nix-index
+              inputs.spicetify.homeManagerModules.default
+              ./hm/modules/default.nix
+            ];
+          };
+        };
       };
       perSystem =
         {
@@ -170,16 +208,6 @@
                 inputs.viminal.packages.${system}.default
               ];
           };
-
-          nixosModules = {
-            default = config.nixosModules.liminalOS;
-            liminalOS = ./modules/default.nix;
-          };
-
-          homeManagerModules = {
-            default = config.homeManagerModules.liminalOS;
-            liminalOS = ./hm/modules/default.nix;
-          };
         };
     };
 }

hm/default.nix

@@ -8,10 +8,6 @@ let
   cfg = config.liminalOS;
 in
 {
-  imports = [
-    inputs.home-manager.nixosModules.home-manager
-  ];
-
   options.liminalOS.integrateHomeManager = lib.mkOption {
     type = lib.types.bool;
     default = cfg.enable;

hm/modules/common/shellenv/default.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  inputs,
   pkgs,
   osConfig,
   ...
@@ -11,7 +10,6 @@ let
 in
 {
   imports = [
-    inputs.nix-index-database.hmModules.nix-index
     ./fastfetch
   ];
 

hm/modules/linux/spicetify/default.nix

@@ -1,19 +1,11 @@
 {
-  inputs,
+  spicepkgs,
-  pkgs,
   config,
   osConfig,
   lib,
   ...
 }:
-let
-  spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
-in
 {
-  imports = [
-    inputs.spicetify.homeManagerModules.default
-  ];
-
   config = lib.mkIf (config.liminalOS.programs.enable && osConfig.liminalOS.config.allowUnfree) {
     programs.spicetify = {
       enable = true;

modules/default.nix

@@ -10,6 +10,7 @@ in
 {
   imports = [
     ./linux
+    ../hm
   ];
   options.liminalOS = {
     darwin.enable = lib.mkOption {

modules/linux/core/default.nix

@@ -183,8 +183,8 @@ in
 
     programs.fish.enable = true;
 
-    services.tlp.enable = lib.mkIf (cfg.formFactor == "laptop") true;
+    services.tlp.enable = lib.mkIf (config.liminalOS.formFactor == "laptop") true;
-    programs.light.enable = lib.mkIf (cfg.formFactor == "laptop") true;
+    programs.light.enable = lib.mkIf (config.liminalOS.formFactor == "laptop") true;
 
     hardware.bluetooth = lib.mkIf cfg.bluetooth.enable {
       enable = true;

modules/linux/flatpak/default.nix

@@ -12,10 +12,6 @@ let
   cfg = config.liminalOS.programs.flatpak;
 in
 {
-  imports = [
-    inputs.nix-flatpak.nixosModules.nix-flatpak
-  ];
-
   options.liminalOS.programs.flatpak = {
     enable = lib.mkOption {
       type = lib.types.bool;

modules/linux/stylix/default.nix

@@ -26,10 +26,6 @@ in
     };
   };
 
-  imports = [
-    inputs.stylix.nixosModules.stylix
-  ];
-
   config = lib.mkIf cfg.enable {
     stylix = {
       enable = true;

modules/linux/wsl/default.nix

@@ -8,10 +8,6 @@ let
   cfg = config.liminalOS.wsl;
 in
 {
-  imports = [
-    inputs.nixos-wsl.nixosModules.default
-  ];
-
   options.liminalOS.wsl = {
     enable = lib.mkEnableOption "WSL";
   };

reference/hosts/demeter/default.nix

@@ -1,13 +1,13 @@
 {
   inputs,
+  self,
   ...
 }:
 {
   imports =
     [
       ./configuration.nix
-      ../../../modules/linux
+      self.nixosModules.liminalOS
-      ../../../hm
       ../../../overlays
       {
         home-manager.users.youwen = {

reference/users/youwen/default.nix

@@ -1,6 +1,7 @@
+{ self, ... }:
 {
   imports = [
-    ../../../hm/modules
+    self.homeManagerModules.liminalOS
   ];
 
   home = {