From 7e79913d5ea94fab094c9356daab71373be4349c Mon Sep 17 00:00:00 2001
From: david <davidcrompton@duck.com>
Date: Sat, 13 Jul 2024 10:42:34 -0400
Subject: [PATCH] Flake: Unify system config spec

---
 flake.nix | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 6806a0b..e3f5a87 100644
--- a/flake.nix
+++ b/flake.nix
@@ -16,11 +16,24 @@
 
     pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
     pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
+
+    sysConfig = config: {
+      system = "x86_64-linux";
+      specialArgs = { inherit inputs; };
+    } // config;
+
+    nixosSystem' = config: nixpkgs.lib.nixosSystem (sysConfig ({
+      
+    } // config));
+
+    darwinSystem' = config: nix-darwin.lib.darwinSystem (sysConfig ({
+      system = "aarch64-darwin";
+    } // config));
+
+    homeConf' = config: home-manager.lib.homeManagerConfiguration config;
   in {
     nixosConfigurations = {
-      nixos = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
+      nixos = nixosSystem' {
         modules =
           [
             ({ config, pkgs, ... }: {
@@ -33,9 +46,7 @@
             modules.sops
           ];
       };
-      universedesktop = nixpkgs.lib.nixosSystem {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
+      universedesktop = nixosSystem' {
         modules =
           [
             ({ config, pkgs, ... }: {
@@ -46,9 +57,7 @@
           ];
       };
     };
-    darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
-      system = "aarch64-darwin";
-      specialArgs = { inherit inputs; };
+    darwinConfigurations."UniverseAir" = darwinSystem' {
       modules = [
         ./machines/universeair/configuration.nix
         ({ config, pkgs, ... }: {
@@ -57,7 +66,7 @@
         modules.home-manager-darwin
       ];
     };
-    homeConfigurations."universelaptop" = home-manager.lib.homeManagerConfiguration {
+    homeConfigurations."universelaptop" = homeConf' {
       pkgs = pkgs_linux-aarch64;
 
       # Specify your home configuration modules here, for example,