From b18938a243e832b4933a26212cddadd3dc885dbc Mon Sep 17 00:00:00 2001
From: Snorre <snorre@altschul.dk>
Date: Mon, 3 Mar 2025 15:56:33 +0100
Subject: [PATCH] Reduced code duplication

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

diff --git a/flake.nix b/flake.nix
index 60d8b03..ece1301 100755
--- a/flake.nix
+++ b/flake.nix
@@ -30,50 +30,50 @@
   in {
     formatter.${system} = pkgs.alejandra;
 
-    nixosConfigurations = {
+    nixosConfigurations = let
+      modules = [inputs.disko.nixosModules.default inputs.agenix.nixosModules.default inputs.home-manager.nixosModules.default];
+    in {
       server-vm = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs;};
-        modules = [
-          inputs.disko.nixosModules.default
-          inputs.agenix.nixosModules.default
-          (import ./disko.nix {
-            lib = pkgs.lib;
-            swap-size = "16G";
-            root-disk = "/dev/vda";
-            raid-disks = [
-              "vdb"
-              "vdc"
-              "vdd"
-            ];
-          })
-          inputs.home-manager.nixosModules.default
+        modules =
+          [
+            (import ./disko.nix {
+              lib = pkgs.lib;
+              swap-size = "16G";
+              root-disk = "/dev/vda";
+              raid-disks = [
+                "vdb"
+                "vdc"
+                "vdd"
+              ];
+            })
 
-          ./vm-hardware-configuration.nix
-          ./configuration.nix
-        ];
+            ./vm-hardware-configuration.nix
+            ./configuration.nix
+          ]
+          ++ modules;
       };
 
       server = nixpkgs.lib.nixosSystem {
         specialArgs = {inherit inputs;};
-        modules = [
-          inputs.disko.nixosModules.default
-          inputs.agenix.nixosModules.default
-          (import ./disko.nix {
-            lib = pkgs.lib;
-            swap-size = "128G";
-            root-disk = "/dev/nvme0n1";
-            raid-disks = [
-              # "sda"
-              # "sdb"
-              # "sdc"
-              # "sdd"
-            ];
-          })
-          inputs.home-manager.nixosModules.default
+        modules =
+          [
+            (import ./disko.nix {
+              lib = pkgs.lib;
+              swap-size = "128G";
+              root-disk = "/dev/nvme0n1";
+              raid-disks = [
+                # "sda"
+                # "sdb"
+                # "sdc"
+                # "sdd"
+              ];
+            })
 
-          ./hardware-configuration.nix
-          ./configuration.nix
-        ];
+            ./hardware-configuration.nix
+            ./configuration.nix
+          ]
+          ++ modules;
       };
     };
   };