From c00b4fb3a68208b77c5c5923f9e8aca7f6e1e6df Mon Sep 17 00:00:00 2001
From: Noa Aarts <noa@voorwaarts.nl>
Date: Tue, 6 May 2025 15:09:44 +0200
Subject: [PATCH] consolidate common modules

---
 flake.nix | 70 +++++++++++++++++++++++++++----------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/flake.nix b/flake.nix
index 23d41aa..a8f39e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -63,49 +63,47 @@
     {
       self,
       nixpkgs,
-      disko,
       ...
     }@inputs:
     {
-      nixosConfigurations = {
-        lambdaOS = nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit inputs;
-          };
-          modules = [
-            ./hosts/lambdaos/configuration.nix
-            inputs.stylix.nixosModules.stylix
-            inputs.home-manager.nixosModules.default
-            inputs.agenix.nixosModules.default
-            inputs.lix-module.nixosModules.default
-          ];
-        };
-        nuOS = nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit inputs;
-          };
-          modules = [
+      nixosConfigurations =
+        let
+          commonModules = with inputs; [
+            stylix.nixosModules.stylix
+            home-manager.nixosModules.default
+            agenix.nixosModules.default
             disko.nixosModules.disko
-            inputs.stylix.nixosModules.stylix
-            ./hosts/nuos/configuration.nix
-            inputs.home-manager.nixosModules.default
-            inputs.agenix.nixosModules.default
-            inputs.authentik.nixosModules.default
           ];
-        };
-        muOS = nixpkgs.lib.nixosSystem {
-          specialArgs = {
-            inherit inputs;
+        in
+        {
+          lambdaOS = nixpkgs.lib.nixosSystem {
+            specialArgs = {
+              inherit inputs;
+            };
+            modules = [
+              ./hosts/lambdaos/configuration.nix
+              inputs.lix-module.nixosModules.default
+            ] ++ commonModules;
+          };
+          nuOS = nixpkgs.lib.nixosSystem {
+            specialArgs = {
+              inherit inputs;
+            };
+            modules = [
+              inputs.authentik.nixosModules.default
+              ./hosts/nuos/configuration.nix
+            ] ++ commonModules;
+          };
+          muOS = nixpkgs.lib.nixosSystem {
+            specialArgs = {
+              inherit inputs;
+            };
+            modules = [
+              inputs.hardware.nixosModules.framework-11th-gen-intel
+              ./hosts/muos/configuration.nix
+            ] ++ commonModules;
           };
-          modules = [
-            disko.nixosModules.disko
-            inputs.stylix.nixosModules.stylix
-            inputs.home-manager.nixosModules.default
-            inputs.hardware.nixosModules.framework-11th-gen-intel
-            ./hosts/muos/configuration.nix
-          ];
         };
-      };
       nixosModules = {
         automapaper = ./modules/automapaper;
       };