diff --git a/home/default.nix b/home/default.nix index cc6d898..3656bcb 100644 --- a/home/default.nix +++ b/home/default.nix @@ -31,6 +31,7 @@ xh # curl/httpie jq # JSON yq # YAML + wget # System info fastfetch @@ -39,20 +40,17 @@ # File management trash-cli - # Terminal multiplexer (alternative) - zellij - # Nix tools - nix-output-monitor # nom — better nix build output + nix-output-monitor # nom nvd # nix version diff - nh # nix helper (nixos-rebuild wrapper) + nh # nix helper # AI coding agent opencode - comment-checker # AI code comment detection hook + comment-checker # Misc - micro # simple editor fallback + micro ]; # XDG directories diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix index e72c733..188666b 100644 --- a/modules/darwin/default.nix +++ b/modules/darwin/default.nix @@ -34,13 +34,64 @@ }; }; - # ── Homebrew (GUI apps not in nixpkgs) ───────────── + # ── Homebrew ─────────────────────────────────────── homebrew = { enable = true; - casks = [ - "raycast" - "arc" + + taps = [ + "antoniorodr/memo" + "steipete/tap" ]; - onActivation.cleanup = "zap"; + + # CLI tools not in nixpkgs or needing brew services + brews = [ + "ffmpeg" + "gitui" + "mas" + "memo" + "mole" + "ollama" + "pandoc" + "poppler" + "tailscale" + "steipete/tap/gogcli" + "steipete/tap/remindctl" + ]; + + # GUI apps + casks = [ + "1password" + "brave-browser" + "cc-switch" + "cherry-studio" + "dbeaver-community" + "discord" + "feishu" + "ghostty" + "keka" + "logitech-g-hub" + "mos" + "orbstack" + "qq" + "raycast" + "spotify" + "telegram-desktop" + "termius" + "visual-studio-code" + "wechat" + "winbox" + ]; + + # Mac App Store + masApps = { + "Microsoft Word" = 462054704; + "Windows App" = 1295203466; + "Xnip" = 1221250572; + }; + + onActivation = { + autoUpdate = true; + cleanup = "zap"; # remove anything not declared above + }; }; }