Flake: Unify system config spec

flake.nix

@@ -16,11 +16,24 @@
 
     pkgs_linux-x86_64 = nixpkgs.legacyPackages."x86-linux";
     pkgs_linux-aarch64 = nixpkgs.legacyPackages."aarch64-linux";
-  in {
+
-    nixosConfigurations = {
+    sysConfig = config: {
-      nixos = nixpkgs.lib.nixosSystem {
       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 = nixosSystem' {
         modules =
           [
             ({ config, pkgs, ... }: {
@@ -33,9 +46,7 @@
             modules.sops
           ];
       };
-      universedesktop = nixpkgs.lib.nixosSystem {
+      universedesktop = nixosSystem' {
-        system = "x86_64-linux";
-        specialArgs = { inherit inputs; };
         modules =
           [
             ({ config, pkgs, ... }: {
@@ -46,9 +57,7 @@
           ];
       };
     };
-    darwinConfigurations."UniverseAir" = nix-darwin.lib.darwinSystem {
+    darwinConfigurations."UniverseAir" = darwinSystem' {
-      system = "aarch64-darwin";
-      specialArgs = { inherit inputs; };
       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,