From 605ee21cf0ee941e88f0ed288e72f6ec70b6ef31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Sun, 23 Mar 2025 22:58:55 +0100
Subject: [PATCH] modules: migrate to nilla

---
 flake.nix                 |  6 +++---
 hosts/default.nix         |  4 ++--
 modules/default.nix       | 18 +++++++++++-------
 modules/nilla/default.nix |  1 +
 modules/nilla/modules.nix | 17 +++++++++++++++++
 nilla.nix                 |  1 +
 6 files changed, 35 insertions(+), 12 deletions(-)
 create mode 100644 modules/nilla/modules.nix

diff --git a/flake.nix b/flake.nix
index f42380a..1468e8f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,10 +20,10 @@
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       inherit systems;
-      imports = [
-        ./modules
-      ];
 
+      flake.nixosModules = nilla.nixosModules;
+      flake.darwinModules = nilla.darwinModules;
+      flake.homeModules = nilla.homeModules;
       flake.nixosConfigurations = nilla.nixosConfigurations;
       flake.darwinConfigurations = nilla.darwinConfigurations;
       flake.homeConfigurations = nilla.homeConfigurations;
diff --git a/hosts/default.nix b/hosts/default.nix
index 3c129f4..4acc074 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -29,7 +29,7 @@ in
 
       baseNixos = inputs.nixpkgs.lib.nixosSystem {
         modules = [
-          inputs.self.nixosModules.combined
+          config.nixosModules.combined
           sharedOptions
         ];
         specialArgs.configurationName = "base";
@@ -37,7 +37,7 @@ in
 
       baseDarwin = inputs.darwin.lib.darwinSystem {
         modules = [
-          inputs.self.darwinModules.combined
+          config.darwinModules.combined
           sharedOptions
         ];
         specialArgs.configurationName = "base";
diff --git a/modules/default.nix b/modules/default.nix
index 7ee30ef..2dc9115 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,17 +1,21 @@
 {
   config,
-  inputs,
-  ...
 }:
+let
+  inputs = builtins.mapAttrs (_: input: input.result) config.inputs;
+  perInput = system: flake: {
+    packages = flake.packages.${system};
+  };
+in
 {
-  flake.homeModules = rec {
+  config.homeModules = rec {
     settei = ./home;
     default = settei;
   };
 
-  flake.nixosModules = rec {
+  config.nixosModules = rec {
     settei = import ./system {
-      inherit (config) perInput;
+      inherit perInput;
       isLinux = true;
     };
     combined = {
@@ -33,9 +37,9 @@
     default = combined;
   };
 
-  flake.darwinModules = rec {
+  config.darwinModules = rec {
     settei = import ./system {
-      inherit (config) perInput;
+      inherit perInput;
       isLinux = false;
     };
     combined = {
diff --git a/modules/nilla/default.nix b/modules/nilla/default.nix
index 8a7dea6..bfcd452 100644
--- a/modules/nilla/default.nix
+++ b/modules/nilla/default.nix
@@ -3,5 +3,6 @@
     ./builders
     ./services.nix
     ./configurations.nix
+    ./modules.nix
   ];
 }
diff --git a/modules/nilla/modules.nix b/modules/nilla/modules.nix
new file mode 100644
index 0000000..7b8a6dc
--- /dev/null
+++ b/modules/nilla/modules.nix
@@ -0,0 +1,17 @@
+{ lib }:
+{
+  options = {
+    nixosModules = lib.options.create {
+      type = lib.types.attrs.of lib.types.raw;
+      default.value = { };
+    };
+    darwinModules = lib.options.create {
+      type = lib.types.attrs.of lib.types.raw;
+      default.value = { };
+    };
+    homeModules = lib.options.create {
+      type = lib.types.attrs.of lib.types.raw;
+      default.value = { };
+    };
+  };
+}
diff --git a/nilla.nix b/nilla.nix
index 7d4b4de..f7ecedd 100644
--- a/nilla.nix
+++ b/nilla.nix
@@ -11,6 +11,7 @@
       ./hosts
       ./assets
       ./services
+      ./modules
     ];
 
     config.inputs = builtins.mapAttrs (_: src: {