From 472e3e05dbad050ba477a1231ea3534ccccbc86d Mon Sep 17 00:00:00 2001
From: Ahmad Ansori Palembani <palembani@gmail.com>
Date: Sun, 3 Nov 2024 08:18:30 +0700
Subject: [PATCH] refactor(nix/darwin): Simplify code

---
 .config/nix/systems/darwin/default.nix | 11 +++--------
 .config/nix/users/default.nix          |  8 +++-----
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/.config/nix/systems/darwin/default.nix b/.config/nix/systems/darwin/default.nix
index f3bb0f3..c2f8d1b 100644
--- a/.config/nix/systems/darwin/default.nix
+++ b/.config/nix/systems/darwin/default.nix
@@ -3,6 +3,7 @@
 let
   mkCommon = import ../../lib/mkCommon.nix;
   mkSystem = import ../../lib/mkSystem.nix;
+  mkBrew = import ../../overlays/darwin/brew.nix;
 in
 {
   # Host list
@@ -21,10 +22,7 @@ in
           unstable = nixpkgs-unstable;
           extraOverlays = [
             inputs.firefox-darwin.overlay
-            (import ../../overlays/darwin/brew.nix {
-              inherit system brew-api;
-              nixpkgs = nixpkgs-stable;
-            })
+            (mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
             (import ../../overlays/darwin/heliport.nix)
           ];
         }
@@ -50,10 +48,7 @@ in
           unstable = nixpkgs-unstable;
           extraOverlays = [
             inputs.firefox-darwin.overlay
-            (import ../../overlays/darwin/brew.nix {
-              inherit system brew-api;
-              nixpkgs = nixpkgs-stable;
-            })
+            (mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
           ];
         }
       ) pkgs pkgs-unstable;
diff --git a/.config/nix/users/default.nix b/.config/nix/users/default.nix
index 47aa082..beae0bb 100644
--- a/.config/nix/users/default.nix
+++ b/.config/nix/users/default.nix
@@ -2,6 +2,7 @@
 
 let
   mkSystem = import ../lib/mkSystem.nix;
+  mkBrew = import ../../overlays/darwin/brew.nix
 in
 {
   # Host list
@@ -21,15 +22,12 @@ in
       system = "x86_64-darwin";
       inherit (
         mkSystem {
-          arch = "x86_64-darwin";
+          arch = system;
           stable = nixpkgs-stable;
           unstable = nixpkgs-unstable;
           extraOverlays = [
             inputs.firefox-darwin.overlay
-            (import ../../overlays/darwin/brew.nix {
-              inherit system brew-api;
-              nixpkgs = nixpkgs-stable;
-            })
+            (mkBrew { inherit system brew-api; nixpkgs = nixpkgs-stable; })
           ];
         }
       ) pkgs pkgs-unstable;