From d8184a09920bf7fe3756d3b62dd0f87197ee0dc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= <nikodem@rabulinski.com>
Date: Sun, 2 Jun 2024 19:49:05 +0200
Subject: [PATCH] hosts: optimize

---
 hosts/default.nix | 32 ++++++++++++++++++++------------
 1 file changed, 20 insertions(+), 12 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index 53fb83f..aef381e 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -16,8 +16,7 @@
     ./kogata
   ];
 
-  builders =
-    let
+  builders = let
       sharedOptions = {
         _file = ./default.nix;
 
@@ -26,11 +25,8 @@
           settei = self;
         };
       };
-    in
-    {
-      nixos =
-        name: module:
-        inputs.nixpkgs.lib.nixosSystem {
+
+      baseNixos = inputs.nixpkgs.lib.nixosSystem {
           modules = [
             inputs.agenix.nixosModules.age
             inputs.disko.nixosModules.disko
@@ -42,14 +38,11 @@
             self.nixosModules.settei
             self.nixosModules.common
             sharedOptions
-            module
           ];
-          specialArgs.configurationName = name;
+          specialArgs.configurationName = "base";
         };
 
-      darwin =
-        name: module:
-        inputs.darwin.lib.darwinSystem {
+      baseDarwin = inputs.darwin.lib.darwinSystem {
           modules = [
             inputs.agenix.darwinModules.age
             inputs.home-manager.darwinModules.home-manager
@@ -57,9 +50,24 @@
             self.darwinModules.settei
             self.darwinModules.common
             sharedOptions
+          ];
+          specialArgs.configurationName = "base";
+        };
+    in {
+      nixos =
+        name: module:
+        baseNixos.extendModules {
+          modules = [
             module
           ];
           specialArgs.configurationName = name;
         };
+
+      darwin =
+        name: module:
+        baseDarwin.extendModules {
+          modules = [module];
+          specialArgs.configurationName = name;
+        };
     };
 }