From 0e909382804fa784626e992a014abaeab1cca5d1 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Sun, 22 Feb 2026 00:14:18 +0100
Subject: [PATCH] Refactor a bit

---
 flake.nix | 56 +++++++++++++++++++++++++++----------------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/flake.nix b/flake.nix
index e7714a6..6706fe3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -54,35 +54,33 @@
         base = ./modules/darwin;
       };
 
-      darwinConfigurations = {
-        larstvei-macbookpro = darwin.lib.darwinSystem {
-          system = "aarch64-darwin";
-          specialArgs = sharedArgs;
-          modules = [
-            home-manager.darwinModules.default
-            ./machines/macbook
-            nix-rosetta-builder.darwinModules.default
-            { nix-rosetta-builder.onDemand = true; }
-          ];
+      darwinConfigurations.larstvei-macbookpro = darwin.lib.darwinSystem {
+        system = "aarch64-darwin";
+        specialArgs = sharedArgs;
+        modules = [
+          home-manager.darwinModules.default
+          ./machines/macbook
+          nix-rosetta-builder.darwinModules.default
+          { nix-rosetta-builder.onDemand = true; }
+        ];
+      };
+
+      nixosConfigurations =
+        let
+          mkLinux =
+            system: path:
+            nixpkgs.lib.nixosSystem {
+              system = system;
+              specialArgs = sharedArgs;
+              modules = [
+                home-manager.nixosModules.default
+                path
+              ];
+            };
+        in
+        {
+          thinkpad = mkLinux "x86_64-linux" ./machines/thinkpad;
+          vm-aarch64 = mkLinux "aarch64-linux" ./machines/vm-aarch64;
         };
-      };
-
-      nixosConfigurations.thinkpad = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = sharedArgs;
-        modules = [
-          home-manager.nixosModules.default
-          ./machines/thinkpad
-        ];
-      };
-
-      nixosConfigurations.vm-aarch64 = nixpkgs.lib.nixosSystem {
-        system = "aarch64-linux";
-        specialArgs = sharedArgs;
-        modules = [
-          home-manager.nixosModules.default
-          ./machines/vm-aarch64
-        ];
-      };
     };
 }