fix: correctly enumerate available logical CPUs on darwin when switching

wimpysworld · Oct 2, 2024 · ee6b4f1 · ee6b4f1
1 parent 5a0443f
commit ee6b4f1
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/darwin/_mixins/scripts/switch-host/switch-host.sh b/darwin/_mixins/scripts/switch-host/switch-host.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 if [ -e "${HOME}/Zero/nix-config" ]; then
-    all_cores=$(nproc)
+    all_cores=$(sysctl -n hw.logicalcpu)
     build_cores=$(printf "%.0f" "$(echo "${all_cores} * 0.75" | bc)")
     echo "Switch nix-darwin ❄️ with ${build_cores} cores"
     nix run nix-darwin -- switch --flake "${HOME}/Zero/nix-config" --cores "${build_cores}" -L

diff --git a/home-manager/_mixins/scripts/nh-home/nh-home.sh b/home-manager/_mixins/scripts/nh-home/nh-home.sh
@@ -18,7 +18,10 @@ fi
 # Proceed if the nix-config directory exists
 if [ -e "${HOME}/Zero/nix-config" ]; then
     # Get the number of processing units
-    all_cores=$(nproc)
+    case "$(uname -s)" in
+        Linux)  all_cores=$(nproc);;
+        Darwin) all_cores=$(sysctl -n hw.logicalcpu);;
+    esac
     # Calculate 75% of the number of processing units
     build_cores=$(printf "%.0f" "$(echo "${all_cores} * 0.75" | bc)")