diff --git a/hosts/darwin/system-default.nix b/hosts/darwin/system-default.nix index 353e7f9..c0cdde7 100644 --- a/hosts/darwin/system-default.nix +++ b/hosts/darwin/system-default.nix @@ -2,7 +2,6 @@ { imports = [ - ../../modules/homebrew.nix nix-homebrew.darwinModules.nix-homebrew ]; @@ -142,4 +141,60 @@ StandardOutPath = "/tmp/remap-keys.out"; }; }; + + homebrew = { + enable = true; + onActivation = { + autoUpdate = true; + cleanup = "zap"; + upgrade = true; + }; + greedyCasks = true; + brews = [ + ]; + casks = [ + # Development + "coteditor" + "ghostty" + "ovito" + # Internet & Network + "clash-verge-rev" + "firefox" + "keepassxc" + "tailscale-app" + # Media + "calibre" + "iina" + "musicbrainz-picard" + # Productivity + "drawio" + "inkscape" + "microsoft-excel" + "microsoft-powerpoint" + "microsoft-word" + "tencent-meeting" + "obsidian" + "slidepilot" + "zotero" + # Utilities + "aerospace" + "hiddenbar" + "keycastr" + "linearmouse" + "localsend" + "maccy" + "snipaste" + ]; + taps = [ + "nikitabobko/tap" + ]; + }; + + nix-homebrew = { + enable = true; + enableRosetta = true; + user = "yanlin"; + autoMigrate = true; + }; + } diff --git a/modules/homebrew.nix b/modules/homebrew.nix deleted file mode 100644 index c68cd4f..0000000 --- a/modules/homebrew.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ config, pkgs, ... }: - -{ - homebrew = { - enable = true; - onActivation = { - autoUpdate = true; - cleanup = "zap"; - upgrade = true; - }; - greedyCasks = true; - brews = [ - ]; - casks = [ - # Development - "coteditor" - "ghostty" - "ovito" - # Internet & Network - "clash-verge-rev" - "firefox" - "keepassxc" - "tailscale-app" - # Media - "calibre" - "iina" - "musicbrainz-picard" - # Productivity - "drawio" - "inkscape" - "microsoft-excel" - "microsoft-powerpoint" - "microsoft-word" - "tencent-meeting" - "obsidian" - "slidepilot" - "zotero" - # Utilities - "aerospace" - "hiddenbar" - "keycastr" - "linearmouse" - "localsend" - "maccy" - "snipaste" - ]; - taps = [ - "nikitabobko/tap" - ]; - }; - - nix-homebrew = { - enable = true; - enableRosetta = true; - user = "yanlin"; - autoMigrate = true; - }; -}