From 6a2057f5318e764d2afbd8a33ed50db312089757 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 29 Jun 2024 13:48:06 +0200
Subject: [PATCH] flake.nix: specify modules and extra config per nixos config

---
 flake.nix | 117 +++++++++++++++++++++++++++++-------------------------
 1 file changed, 63 insertions(+), 54 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4c1af2a..e4cff20 100644
--- a/flake.nix
+++ b/flake.nix
@@ -162,66 +162,75 @@
     };
 
     nixosConfigurations = let
-      nixSys = name:
-        nixpkgs.lib.nixosSystem {
-          inherit system;
-          inherit pkgs;
-          inherit (pkgs) lib;
-          modules = [
-            "${home-manager}/nixos"
-            ./modules/machineVars.nix
-            ./modules/socketActivation.nix
-            ./hosts/common
-            ./hosts/${name}/configuration.nix
+      nixSys = name: extraConfig:
+        nixpkgs.lib.nixosSystem
+          ({
+            inherit system;
+            inherit pkgs;
+            inherit (pkgs) lib;
 
-            matrix-synapse-next.nixosModules.default
-            osuchan.outputs.nixosModules.default
-            secrets.outputs.nixos-config
-            sops-nix.nixosModules.sops
-            vscode-server.nixosModules.default
-            maunium-stickerpicker.nixosModules.default
+            specialArgs = {
+              inherit inputs;
+              inherit unstable-pkgs;
+              inherit (self) extendedLib;
+              secrets = secrets.outputs.settings;
+            } // (extraConfig.specialArgs or { });
 
-            (args: import minecraft.outputs.nixosModules.minecraft-servers (args // {
-              pkgs = unstable-pkgs;
-              lib = unstable-pkgs.lib;
-            }))
+            modules = [
+              "${home-manager}/nixos"
 
-            {
-              config._module.args = {
-                inherit inputs;
-                inherit unstable-pkgs;
-                inherit (self) extendedLib;
-                secrets = secrets.outputs.settings;
-              };
-            }
+              ./hosts/common
+              ./hosts/${name}/configuration.nix
 
-            ({ config, ... }:
-            {
-              home-manager = {
-                useGlobalPkgs = true;
-                extraSpecialArgs = {
-                  inherit inputs;
-                  inherit (self) extendedLib;
-                  inherit (config) machineVars;
-                  hostname = name;
-                  secrets = secrets.outputs.settings;
+              ./modules/machineVars.nix
+              ./modules/socketActivation.nix
+
+              secrets.outputs.nixos-config
+              sops-nix.nixosModules.sops
+
+              ({ config, ... }:
+              {
+                home-manager = {
+                  useGlobalPkgs = true;
+                  extraSpecialArgs = {
+                    inherit inputs;
+                    inherit (self) extendedLib;
+                    inherit (config) machineVars;
+                    hostname = name;
+                    secrets = secrets.outputs.settings;
+                  };
+
+                  sharedModules = [
+                    inputs.sops-nix.homeManagerModules.sops
+                  ];
+
+                  users.h7x4.imports = [ ./home/home.nix ];
                 };
-
-                sharedModules = [
-                  inputs.sops-nix.homeManagerModules.sops
-                ];
-
-                users.h7x4 = {
-                  imports = [ ./home/home.nix ];
-                };
-              };
-            })
-          ];
-        };
+              })
+            ] ++ (extraConfig.modules or [ ]);
+          }
+          //
+          (builtins.removeAttrs extraConfig [
+            "modules"
+            "specialArgs"
+          ]));
     in {
-      tsuki = nixSys "tsuki";
-      kasei = nixSys "kasei";
-      dosei = nixSys "dosei";
+      dosei = nixSys "dosei" { };
+      kasei = nixSys "kasei" { };
+      tsuki = nixSys "tsuki" {
+        modules = [
+          matrix-synapse-next.nixosModules.default
+          osuchan.outputs.nixosModules.default
+          sops-nix.nixosModules.sops
+          vscode-server.nixosModules.default
+          maunium-stickerpicker.nixosModules.default
+
+          (args: import minecraft.outputs.nixosModules.minecraft-servers (args // {
+            pkgs = unstable-pkgs;
+            lib = unstable-pkgs.lib;
+          }))
+        ];
+      };
     };
   };
 }