Support both Intel and Apple Silicon macs

Fixes #12
This commit is contained in:
2024-10-13 22:02:15 +01:00
parent 9f993c39b2
commit fc715cdf32
2 changed files with 24 additions and 2 deletions

View File

@@ -50,7 +50,14 @@ case $main_menu in
mkdir -p ~/.config/nix-darwin/ mkdir -p ~/.config/nix-darwin/
cp -rf ./nix/macOS/* ~/.config/nix-darwin/ cp -rf ./nix/macOS/* ~/.config/nix-darwin/
cp -f ./nix/home.nix ~/.config/nix-darwin/ cp -f ./nix/home.nix ~/.config/nix-darwin/
if [[ $(uname -m) == "x86_64" ]]; then
echo "Intel mac detected."
nix --extra-experimental-features "nix-command flakes" run nix-darwin -- switch --flake ~/.config/nix-darwin#x86
else
echo "Apple silicon detected."
nix --extra-experimental-features "nix-command flakes" run nix-darwin -- switch --flake ~/.config/nix-darwin#default nix --extra-experimental-features "nix-command flakes" run nix-darwin -- switch --flake ~/.config/nix-darwin#default
fi
;; ;;
*) *)
echo "Invalid option selected." echo "Invalid option selected."

View File

@@ -143,8 +143,14 @@
enableKeyMapping = true; enableKeyMapping = true;
remapCapsLockToControl = true; remapCapsLockToControl = true;
}; };
};
nixpkgs.hostPlatform = "x86_64-darwin"; # aarch64-darwin for ARM intel = { pkgs, config, ... }: {
nixpkgs.hostPlatform = "x86_64-darwin";
};
apple-silicon = { pkgs, config, ... }: {
nixpkgs.hostPlatform = "aarch64-darwin";
}; };
in in
{ {
@@ -153,6 +159,15 @@
darwinConfigurations.default = nix-darwin.lib.darwinSystem { darwinConfigurations.default = nix-darwin.lib.darwinSystem {
modules = [ modules = [
configuration configuration
apple-silicon
inputs.mac-app-util.darwinModules.default
inputs.home-manager.darwinModules.default
];
};
darwinConfigurations.x86 = nix-darwin.lib.darwinSystem {
modules = [
configuration
intel
inputs.mac-app-util.darwinModules.default inputs.mac-app-util.darwinModules.default
inputs.home-manager.darwinModules.default inputs.home-manager.darwinModules.default
]; ];