From c3ebcbcc24c0df0792bc628b71ea1615fd103cd5 Mon Sep 17 00:00:00 2001 From: himkt Date: Wed, 18 Feb 2026 18:04:56 +0900 Subject: [PATCH 1/2] feat: detect platform in make --- Makefile | 63 ++++++++++++++++++++++++++------------------------------ 1 file changed, 29 insertions(+), 34 deletions(-) diff --git a/Makefile b/Makefile index 94d5ca4..08aa21f 100644 --- a/Makefile +++ b/Makefile @@ -1,48 +1,43 @@ -.PHONY: macos-build macos-switch macos-brew-install macos-brew macos-brew-gui macos-brew-optional macos-brew-himkt macos-update macos-clean macos-gc nixos-build nixos-switch nixos-update nixos-clean nixos-gc +UNAME := $(shell uname -s) -# macOS targets -macos-build: - nix build .#darwinConfigurations.macos.system +ifeq ($(UNAME),Darwin) + NIX_BUILD_CMD := nix build .\#darwinConfigurations.macos.system + NIX_SWITCH_CMD := sudo darwin-rebuild switch --flake .\#macos +else + NIX_BUILD_CMD := nix build .\#nixosConfigurations.nixos.config.system.build.toplevel + NIX_SWITCH_CMD := sudo nixos-rebuild switch --flake .\#nixos +endif -macos-switch: - sudo darwin-rebuild switch --flake .#macos +.PHONY: build switch update clean gc brew-install brew brew-gui brew-optional brew-himkt -macos-brew-install: - $(PWD)/brew/bin/setup.sh +# Nix targets (platform-aware) +build: + $(NIX_BUILD_CMD) -macos-brew: - brew bundle --verbose --file=$(PWD)/brew/config.d/base/Brewfile +switch: + $(NIX_SWITCH_CMD) -macos-brew-gui: - brew bundle --verbose --file=$(PWD)/brew/config.d/gui/Brewfile - -macos-brew-optional: - brew bundle --verbose --file=$(PWD)/brew/config.d/optional/Brewfile - -macos-brew-himkt: - brew bundle --verbose --file=$(PWD)/brew/config.d/himkt/Brewfile - -macos-update: +update: nix flake update -macos-clean: - sudo nix-env --delete-generations +7 --profile /nix/var/nix/profiles/system-profiles/darwin +clean: + sudo nix-env --delete-generations +7 --profile /nix/var/nix/profiles/system -macos-gc: +gc: sudo nix-collect-garbage -d -# NixOS targets -nixos-build: - nix build .#nixosConfigurations.nixos.config.system.build.toplevel +# Homebrew targets (macOS only) +brew-install: + $(PWD)/brew/bin/setup.sh -nixos-switch: - sudo nixos-rebuild switch --flake .#nixos +brew: + brew bundle --verbose --file=$(PWD)/brew/config.d/base/Brewfile -nixos-update: - nix flake update +brew-gui: + brew bundle --verbose --file=$(PWD)/brew/config.d/gui/Brewfile -nixos-clean: - sudo nix-env --delete-generations +7 --profile /nix/var/nix/profiles/system +brew-optional: + brew bundle --verbose --file=$(PWD)/brew/config.d/optional/Brewfile -nixos-gc: - sudo nix-collect-garbage -d +brew-himkt: + brew bundle --verbose --file=$(PWD)/brew/config.d/himkt/Brewfile From 4be51241c3afb6a57af71f85601c5abd1aed92fa Mon Sep 17 00:00:00 2001 From: himkt Date: Wed, 18 Feb 2026 18:07:51 +0900 Subject: [PATCH 2/2] fix: make recipe in CI --- .github/workflows/macos.yml | 2 +- .github/workflows/nixos.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 58c57d8..7da0bbb 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,4 +11,4 @@ jobs: - uses: actions/checkout@v6 - uses: DeterminateSystems/nix-installer-action@main - name: Build nix-darwin configuration - run: make macos-build + run: make build diff --git a/.github/workflows/nixos.yml b/.github/workflows/nixos.yml index b0efe79..390f1bb 100644 --- a/.github/workflows/nixos.yml +++ b/.github/workflows/nixos.yml @@ -11,4 +11,4 @@ jobs: - uses: actions/checkout@v6 - uses: DeterminateSystems/nix-installer-action@main - name: Build NixOS configuration - run: make nixos-build + run: make build