feat: introduce nix-darwin again

.github/workflows/macos.yml

@@ -1,30 +1,14 @@
-name: macOS test
+name: macOS nix-darwin build check
 on:
   push:
     branches:
       - main
   pull_request:
 jobs:
-  main:
+  build:
     runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v4
-      - name: uninstall builtin homebrew on macOS
-        run: |
-          sudo rm -rf /opt/homebrew
-      - name: setup dotfiles
-        run: |
-          cp -r $GITHUB_WORKSPACE $HOME/dotfiles
-          cd $HOME/dotfiles
-          make
-          make brew
-      - name: install packages
-        run: |
-          source $HOME/.zshrc
-          make brew-base
-        shell: zsh {0}
-      - name: brew doctor on macOS
-        run: |
-          # NOTE(himkt); skip this on Ubuntu since brew doctor won't succeed
-          #              due to the installation path.
-          brew doctor
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Build nix-darwin configuration
+        run: make macos-build

.github/workflows/nixos.yml

@@ -0,0 +1,14 @@
+name: NixOS build check
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - uses: DeterminateSystems/nix-installer-action@main
+      - name: Build NixOS configuration
+        run: make nixos-build

.gitignore

@@ -1,21 +1,4 @@
 .*
 !.gitignore
-!.gitmodules
-!.amethyst
-!.bashrc
-!.zshrc
-!.vimrc
-!.tmux.conf
-!.osx.tmux.conf
-!.octaverc
-!.vim
-!.zsh
-!.keep
-
-*private*
-*secret*
-
-# https://github.com/himkt/omoide
-/bin/omoide
-# https://github.com/himkt/auto-release
-/bin/auto-release
+!.github/
+result

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2017-2025 himkt
+Copyright (c) 2017-2026 himkt
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,113 +1,48 @@
-# Makefile for dotfile configs
-RED        := $(shell tput setaf 1)
-NOCOLOR    := $(shell tput sgr0)
+.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
 
-.PHONY: \
-	all docs brew \
-	base cli darwin gui \
-	git ghostty nvim sheldon tmux uv zsh
+# macOS targets
+macos-build:
+	nix build .#darwinConfigurations.macos.system
 
-all: git tmux zsh docs
-optional: all darwin ghostty git mise nvim sheldon uv
+macos-switch:
+	sudo darwin-rebuild switch --flake .#macos
 
-# =========================
-
-brew:
+macos-brew-install:
 	$(PWD)/brew/bin/setup.sh
 
-brew-base:
+macos-brew:
 	brew bundle --verbose --file=$(PWD)/brew/config.d/base/Brewfile
 
-brew-optional:
-	brew bundle --verbose --file=$(PWD)/brew/config.d/optional/Brewfile
-
-brew-gui:
+macos-brew-gui:
 	brew bundle --verbose --file=$(PWD)/brew/config.d/gui/Brewfile
 
-brew-himkt:
-	brew bundle --verbose --file=$(PWD)/brew/config.d/himkt/Brewfile
-
-krew-base:
-	kubectl krew install open-svc ns images ctx stern neat
-
-# =========================
-
-darwin:
-	$(PWD)/darwin/bin/setup.sh
-
-ghostty: ghostty_clean
-	$(PWD)/ghostty/bin/setup.sh
-
-git: git_clean
-	$(PWD)/git/bin/setup.sh
-
-mise: mise_clean
-	$(PWD)/mise/bin/setup.sh
-
-nvim: nvim_clean
-	$(PWD)/nvim/bin/setup.sh
-
-sheldon: sheldon_clean
-	$(PWD)/sheldon/bin/setup.sh
-
-tmux: tmux_clean
-	$(PWD)/tmux/bin/setup.sh
-
-uv: uv_clean
-	$(PWD)/uv/bin/setup.sh
-
-zsh: zsh_clean
-	$(PWD)/zsh/bin/setup.sh
-
-# =========================
-
-ghostty_clean:
-	rm -rf $(HOME)/.config/ghostty
+macos-brew-optional:
+	brew bundle --verbose --file=$(PWD)/brew/config.d/optional/Brewfile
 
-git_clean:
-	rm -rf $(HOME)/.config/git/config
-	rm -rf $(HOME)/.config/git/ignore
+macos-brew-himkt:
+	brew bundle --verbose --file=$(PWD)/brew/config.d/himkt/Brewfile
 
-mise_clean:
-	rm -rf $(HOME)/.config/mise
+macos-update:
+	nix flake update
 
-nvim_clean:
-	rm -rf $(HOME)/.vimrc
-	rm -rf $(HOME)/.vim
-	rm -rf $(HOME)/.config/nvim
+macos-clean:
+	sudo nix-env --delete-generations +7 --profile /nix/var/nix/profiles/system-profiles/darwin
 
-sheldon_clean:
-	rm -rf $(HOME)/.config/sheldon
+macos-gc:
+	sudo nix-collect-garbage -d
 
-tmux_clean:
-	rm -rf $(HOME)/.tmux.conf
+# NixOS targets
+nixos-build:
+	nix build .#nixosConfigurations.nixos.config.system.build.toplevel
 
-uv_clean:
-	rm -rf $(HOME)/.local/bin/uv $(HOME)/.local/bin/uvx
-	rm -rf $(HOME)/.config/uv
+nixos-switch:
+	sudo nixos-rebuild switch --flake .#nixos
 
-zsh_clean:
-	rm -rf $(HOME)/.zshrc
+nixos-update:
+	nix flake update
 
-# =========================
+nixos-clean:
+	sudo nix-env --delete-generations +7 --profile /nix/var/nix/profiles/system
 
-docs:
-	@echo ""
-	@echo "### Finish installing dotfiles!"
-	@echo "Please run $(RED)source $$HOME/.zshrc$(NOCOLOR) on zsh to enable configures."
-	@echo "- If you want to use nvim with extensions, please run $(RED)make nvim$(NOCOLOR) (which needs pyenv)."
-	@echo "- If you want to install pyenv using brew, please read the Python section below."
-	@echo ""
-	@echo "---"
-	@echo ""
-	@echo "### Packages"
-	@echo "- If you want to use linuxbrew/homebrew, please run $(RED)make brew-cui$(NOCOLOR)."
-	@echo "- Please run $(RED)make brew$(NOCOLOR) before if you have not installed brew yet"
-	@echo "- Additionally, $(RED)make brew-optional$(NOCOLOR) installs optional packages"
-	@echo ""
-	@echo "---"
-	@echo ""
-	@echo "### Python"
-	@echo "- After $(RED)make brew, make brew-cui, source $$HOME/.zshrc$(NOCOLOR),"
-	@echo "  you can run $(RED)make nvim$(NOCOLOR) to install Python and the nvim library"
-	@echo ""
+nixos-gc:
+	sudo nix-collect-garbage -d

README.md

@@ -1,17 +1,67 @@
-## dotfiles
+# dotfiles
 
-[![macOS test](https://github.com/himkt/dotfiles/actions/workflows/macos.yml/badge.svg)](https://github.com/himkt/dotfiles/actions/workflows/macos.yml)
+[![macOS](https://img.shields.io/github/actions/workflow/status/himkt/dotfiles/macos.yml?label=macOS&logo=apple)](https://github.com/himkt/dotfiles/actions/workflows/macos.yml)
+[![NixOS](https://img.shields.io/github/actions/workflow/status/himkt/dotfiles/nixos.yml?label=NixOS&logo=nixos&logoColor=white)](https://github.com/himkt/dotfiles/actions/workflows/nixos.yml)
 
-## Installation
+Unified Nix-based configuration for macOS (nix-darwin) and NixOS.
+
+## Structure
 
 ```
-git clone git@github.com:himkt/dotfiles $HOME/dotfiles
-cd $HOME/dotfiles && make
+dotfiles/
+├── flake.nix          # Unified flake (NixOS + nix-darwin)
+├── Makefile           # Build and setup targets
+├── hosts/
+│   ├── nixos/         # NixOS system configuration
+│   └── macos/         # nix-darwin system configuration
+├── home/
+│   ├── nixos.nix      # NixOS Home Manager entry point
+│   ├── macos.nix      # macOS Home Manager entry point
+│   └── modules/       # Shared and platform-specific modules
+├── brew/              # Homebrew Brewfiles (macOS)
+└── secrets/           # sops-nix encrypted secrets
 ```
 
-### Homebrew/Linuxbrew
+## Setup
+
+### macOS
+
+1. Install [Nix](https://nixos.org/download/)
+2. Clone this repository to `~/dotfiles`
+3. Apply the nix-darwin configuration:
+   ```
+   make macos-switch
+   ```
+4. Install Homebrew packages:
+   ```
+   make macos-brew
+   make macos-brew-gui
+   ```
+
+### NixOS
+
+1. Clone this repository to `~/dotfiles`
+2. Apply the NixOS configuration:
+   ```
+   make nixos-switch
+   ```
 
-If you don't have `brew`, you have to run `make brew` in advance.
+## Makefile Targets
 
-- `make brew-base`: install essential tools
-- `make brew-gui`: install GUI apps for macOS
+| Target | Description |
+|--------|-------------|
+| `macos-build` | Build nix-darwin configuration (dry run) |
+| `macos-switch` | Apply nix-darwin + Home Manager configuration |
+| `macos-brew-install` | Install Homebrew |
+| `macos-brew` | Install base Homebrew packages |
+| `macos-brew-gui` | Install GUI Homebrew packages |
+| `macos-brew-optional` | Install optional Homebrew packages |
+| `macos-brew-himkt` | Install personal Homebrew packages |
+| `macos-update` | Update flake inputs |
+| `macos-clean` | Delete old macOS generations (keep last 7) |
+| `macos-gc` | Run Nix garbage collection |
+| `nixos-build` | Build NixOS configuration (dry run) |
+| `nixos-switch` | Apply NixOS + Home Manager configuration |
+| `nixos-update` | Update flake inputs |
+| `nixos-clean` | Delete old NixOS generations (keep last 7) |
+| `nixos-gc` | Run Nix garbage collection |

brew/config.d/base/Brewfile

@@ -1,10 +1,3 @@
 brew 'coreutils'
-brew 'fzf'
 brew 'gh'
-brew 'git-lfs'
 brew 'jq'
-brew 'sheldon'
-brew 'tree'
-brew 'zoxide'
-
-cask 'corretto@17'

brew/config.d/gui/Brewfile

@@ -1,6 +1,5 @@
 cask 'claude-code'
 cask 'codex'
-cask 'font-jetbrains-mono'
 cask 'ghostty'
 cask 'google-chrome'
 cask 'netron'

brew/config.d/himkt/Brewfile

@@ -1,4 +1,3 @@
 tap  'himkt/tap'
-brew 'himkt/tap/pathfinder'
 brew 'himkt/tap/tips-cli'
 cask 'himkt/tap/voicevox'

brew/config.d/optional/Brewfile

@@ -4,9 +4,5 @@ brew 'btop'
 brew 'krew'
 brew 'kubernetes-cli'
 brew 'libpq'
-brew 'mise'
-brew 'tmux'
-brew 'uv'
-
 tap  'derailed/k9s'
 brew 'derailed/k9s/k9s'