switch to brew for managing all apps

This commit is contained in:
2024-11-26 23:09:17 -08:00
parent ce78f833f3
commit e73044a1ca
4 changed files with 30 additions and 165 deletions

114
Brewfile
View File

@@ -1,114 +0,0 @@
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/cask-drivers"
tap "homebrew/cask-fonts"
tap "homebrew/cask-versions"
tap "homebrew/core"
brew "autoconf"
brew "automake"
brew "openssl@1.1"
brew "brew-cask-completion"
brew "brew-gem"
brew "brew-pip"
brew "bsdmake"
brew "freetype"
brew "fontconfig"
brew "xz"
brew "python@3.9"
brew "pkg-config"
brew "cmake"
brew "cmatrix"
brew "ruby"
brew "cocoapods"
brew "coreutils"
brew "gnu-tar"
brew "dpkg"
brew "elinks"
brew "exiftool"
brew "harfbuzz"
brew "sdl2"
brew "ffmpeg"
brew "figlet"
brew "fortune"
brew "gcc"
brew "git"
brew "gnu-sed"
brew "go"
brew "hashcat"
brew "htop"
brew "imagemagick"
brew "jq"
brew "ldid"
brew "libusbmuxd"
brew "libimobiledevice"
brew "librsvg"
brew "llvm"
brew "lolcat"
brew "macvim"
brew "mas"
brew "nasm"
brew "node"
brew "nativefier"
brew "neofetch"
brew "nmap"
brew "openjdk"
brew "p7zip"
brew "pngcheck"
brew "rsync"
brew "sl"
brew "speedtest-cli"
brew "svg2png"
brew "telnet"
brew "tldr"
brew "tmux"
brew "tree"
brew "watch"
brew "wget"
brew "whois"
brew "youtube-dl"
brew "zsh"
brew "zsh-completions"
brew "zsh-history-substring-search"
brew "zsh-syntax-highlighting"
brew "zzz"
cask "alacritty"
cask "android-platform-tools"
cask "appcleaner"
cask "daisydisk"
cask "discord-canary"
cask "displaylink"
cask "displaylink-login-extension"
cask "dolphin-dev"
cask "firefox"
cask "font-fira-code"
cask "handbrake"
cask "hex-fiend"
cask "iina"
cask "makemkv"
cask "melonds"
cask "qbittorrent"
cask "rectangle"
cask "slack"
cask "steam"
cask "visual-studio-code"
cask "vlc"
cask "xquartz"
cask "zoom"
mas "1Password 7", id: 1333542190
mas "Dark Noise", id: 1465439395
mas "Dark Reader for Safari", id: 1438243180
mas "DaVinci Resolve", id: 571213070
mas "Deliveries", id: 290986013
mas "Developer", id: 640199958
mas "Flighty", id: 1358823008
mas "Jump Desktop", id: 524141863
mas "Keynote", id: 409183694
mas "Notability", id: 360593530
mas "Pages", id: 409201541
mas "Paste", id: 967805235
mas "TestFlight", id: 899247664
mas "The Unarchiver", id: 425424353
mas "Tripsy", id: 1429967544
mas "Wipr", id: 1320666476
mas "Xcode", id: 497799835
mas "Yoink", id: 457622435

View File

@@ -14,7 +14,7 @@ function shownetinfo() {
ROUTR=$(system_profiler SPNetworkDataType | grep "Router:" | cut -c 19-30 | head -1)
LANIP=$(ifconfig | grep -v "127.0.0.1" | grep "inet " | head -1 | cut -d " " -f2)
if [ "$ROUTR" != "" ]; then
WANIP=$(gtimeout 0.25s curl -s ipv4.icanhazip.com)
WANIP=$(timeout 0.25s curl -s ipv4.icanhazip.com)
fi
fi
tput setaf 7; tput bold; echo -en "Net: "

26
nix/flake.lock generated
View File

@@ -3,16 +3,16 @@
"brew-src": {
"flake": false,
"locked": {
"lastModified": 1727016223,
"narHash": "sha256-iZqd91Cp4O02BU6/eBZ0UZgJN8AlwH+0geQUpqF176E=",
"lastModified": 1731323744,
"narHash": "sha256-SxUQm4cTHcaoPQHoXe26ZV8cZiMWBGow8MjE4L+MckM=",
"owner": "Homebrew",
"repo": "brew",
"rev": "916044581862c32fc2365e8e9ff0b1507a98925e",
"rev": "254bf3fe9d8fa2e1b2fb55dbcf535b2d870180c4",
"type": "github"
},
"original": {
"owner": "Homebrew",
"ref": "4.3.24",
"ref": "4.4.5",
"repo": "brew",
"type": "github"
}
@@ -42,11 +42,11 @@
]
},
"locked": {
"lastModified": 1731454423,
"narHash": "sha256-TtwvgFxUa0wyptLhQbKaixgNW1UXf3+TDqfX3Kp63oM=",
"lastModified": 1732603785,
"narHash": "sha256-AEjWTJwOmSnVYsSJCojKgoguGfFfwel6z/6ud6UFMU8=",
"owner": "LnL7",
"repo": "nix-darwin",
"rev": "6c71c49e2448e51ad830ed211024e6d0edc50116",
"rev": "6ab87b7c84d4ee873e937108c4ff80c015a40c7a",
"type": "github"
},
"original": {
@@ -81,11 +81,11 @@
"nixpkgs": "nixpkgs_2"
},
"locked": {
"lastModified": 1731434956,
"narHash": "sha256-WmEUrnmLxqUg1ltf1x0LKb9RZr4mrqu9OtHKlVC1m7s=",
"lastModified": 1732145543,
"narHash": "sha256-VRQh/lvCSko9YV7haXyPt7DSp+EkgjjBv/9U4cY9c50=",
"owner": "zhaofengli-wip",
"repo": "nix-homebrew",
"rev": "2ed1e70db2448bd997b7b0c52f7bef42ac7a51a7",
"rev": "ac3945ee614f69ab89c6935b3f0567028de5f012",
"type": "github"
},
"original": {
@@ -125,11 +125,11 @@
},
"nixpkgs_3": {
"locked": {
"lastModified": 1731245184,
"narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=",
"lastModified": 1732238832,
"narHash": "sha256-sQxuJm8rHY20xq6Ah+GwIUkF95tWjGRd1X8xF+Pkk38=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "aebe249544837ce42588aa4b2e7972222ba12e8f",
"rev": "8edf06bea5bcbee082df1b7369ff973b91618b8d",
"type": "github"
},
"original": {

View File

@@ -20,59 +20,58 @@
[
pkgs.fastfetch
pkgs.coreutils
pkgs.mkalias
pkgs.openjdk17
pkgs.openjdk21
pkgs.appcleaner
pkgs.discord
pkgs.docker
pkgs.iina
pkgs.iterm2
pkgs.obsidian
pkgs.ollama
pkgs.openscad
pkgs.prismlauncher
pkgs.qbittorrent
pkgs.rectangle
pkgs.vscode
];
homebrew = {
enable = true;
casks = [
"alfred"
"appcleaner"
"balenaetcher"
"bambu-studio"
"daisydisk"
"discord"
"docker"
"firefox"
"font-sf-mono"
"iina"
"istat-menus"
"iterm2"
"obsidian"
"ollama"
"prismlauncher"
"protonvpn"
"qbittorrent"
"raspberry-pi-imager"
"raycast"
"rectangle"
"scroll-reverser"
"sf-symbols"
"steam"
"visual-studio-code"
];
brews = [
"asitop"
"bpytop"
"mas"
];
masApps = {
"Broadcasts" = 1469995354;
"Callsheet" = 1672356376;
"Developer" = 640199958;
"Flighty" = 1358823008;
"Infuse" = 1136220934;
"Noir" = 1592917505;
"Numbers" = 409203825;
"Overcast" = 888422857;
"Pages" = 409201541;
"SponsorBlock" = 1573461917;
"TestFlight" = 899247664;
"TheUnarchiver" = 425424353;
"Unread" = 1363637349;
"WiFiMan" = 1385561119;
"Wipr" = 1320666476;
"Xcode" = 497799835;
"WireGuard" = 1451685025;
"Xcode" = 497799835;
};
onActivation.cleanup = "zap";
onActivation.autoUpdate = true;
@@ -86,26 +85,6 @@
# Necessary for using flakes on this system.
nix.settings.experimental-features = "nix-command flakes";
system.activationScripts.applications.text = let
env = pkgs.buildEnv {
name = "system-applications";
paths = config.environment.systemPackages;
pathsToLink = "/Applications";
};
in
pkgs.lib.mkForce ''
# Set up applications.
echo "setting up /Applications..." >&2
rm -rf /Applications/Nix\ Apps
mkdir -p /Applications/Nix\ Apps
find ${env}/Applications -maxdepth 1 -type l -exec readlink '{}' + |
while read -r src; do
app_name=$(basename "$src")
echo "copying $src" >&2
${pkgs.mkalias}/bin/mkalias "$src" "/Applications/Nix Apps/$app_name"
done
'';
system.defaults = {
dock.autohide = true;
trackpad.Clicking = true;