2025-06-21

This commit is contained in:
2025-06-21 11:11:32 -04:00
parent e3b1617109
commit ac21a4a496
6 changed files with 57 additions and 54 deletions
+46 -17
View File
@@ -1,34 +1,31 @@
tap "charmbracelet/tap" tap "charmbracelet/tap"
tap "dotenvx/brew" tap "dotenvx/brew"
tap "ghall89/tap" tap "ghall89/tap"
tap "homebrew/bundle"
tap "homebrew/cask"
tap "homebrew/cask-fonts"
tap "homebrew/core"
tap "homebrew/services"
tap "marsanne/cask" tap "marsanne/cask"
tap "oven-sh/bun" tap "oven-sh/bun"
brew "jq" brew "jq"
brew "ansiweather" brew "ansiweather"
brew "atuin" brew "atuin"
brew "bazel"
brew "bchunk" brew "bchunk"
brew "btop" brew "btop"
brew "cloc" brew "cloc"
brew "csvkit" brew "csvkit"
brew "exiv2" brew "exiv2"
brew "eza" brew "eza"
brew "icu4c@76"
brew "ffmpeg" brew "ffmpeg"
brew "flyctl" brew "flyctl"
brew "fzf" brew "fzf"
brew "gh" brew "gh"
brew "git" brew "git"
brew "gitmoji"
brew "gleam" brew "gleam"
brew "glow" brew "glow"
brew "gnupg" brew "gnupg"
brew "go" brew "go"
brew "gum" brew "gum"
brew "helix" brew "helix"
brew "icu4c@76"
brew "libheif" brew "libheif"
brew "imagemagick" brew "imagemagick"
brew "lazygit" brew "lazygit"
@@ -41,10 +38,12 @@ brew "mint"
brew "mods" brew "mods"
brew "nvm" brew "nvm"
brew "oh-my-posh" brew "oh-my-posh"
brew "ollama"
brew "pandoc" brew "pandoc"
brew "parallel" brew "parallel"
brew "pnpm" brew "pnpm"
brew "ripgrep" brew "ripgrep"
brew "rust"
brew "sf-pwgen" brew "sf-pwgen"
brew "speedtest-cli" brew "speedtest-cli"
brew "swift-format" brew "swift-format"
@@ -63,29 +62,32 @@ cask "airbuddy"
cask "app-tamer" cask "app-tamer"
cask "appflowy" cask "appflowy"
cask "arc" cask "arc"
cask "arq"
cask "autodock"
cask "bbedit" cask "bbedit"
cask "carbon-copy-cloner"
cask "contexts" cask "contexts"
cask "cork" cask "cork"
cask "daisydisk" cask "daisydisk"
cask "discord" cask "discord"
cask "firefox@nightly"
cask "fork" cask "fork"
cask "gb-studio" cask "gb-studio"
cask "ghostty" cask "ghostty"
cask "gog-galaxy"
cask "hazel" cask "hazel"
cask "iina"
cask "imageoptim" cask "imageoptim"
cask "istat-menus"
cask "jordanbaird-ice" cask "jordanbaird-ice"
cask "keka"
cask "keyboardcleantool" cask "keyboardcleantool"
cask "keystash"
cask "mac-mouse-fix" cask "mac-mouse-fix"
cask "mailmate@beta"
cask "nova" cask "nova"
cask "onyx" cask "onyx"
cask "openemu" cask "openemu"
cask "paletro" cask "paletro"
cask "pictogram" cask "pictogram"
cask "postgres-unofficial" cask "postgres-unofficial"
cask "proton-mail-bridge"
cask "qlmarkdown" cask "qlmarkdown"
cask "quicklook-json" cask "quicklook-json"
cask "raycast" cask "raycast"
@@ -95,13 +97,17 @@ cask "siphon"
cask "slack" cask "slack"
cask "spamsieve" cask "spamsieve"
cask "steam" cask "steam"
cask "swift-shift"
cask "swiftformat-for-xcode" cask "swiftformat-for-xcode"
cask "tableplus" cask "tableplus"
cask "the-unarchiver" cask "the-unarchiver"
cask "tunnelblick"
cask "vanilla"
cask "visual-studio-code"
cask "vivaldi" cask "vivaldi"
cask "whisky"
cask "xscope" cask "xscope"
cask "zed" cask "zed"
cask "zen"
mas "1Blocker", id: 1365531024 mas "1Blocker", id: 1365531024
mas "Actions", id: 1586435171 mas "Actions", id: 1586435171
mas "Affinity Designer 2", id: 1616831348 mas "Affinity Designer 2", id: 1616831348
@@ -110,24 +116,24 @@ mas "Affinity Publisher 2", id: 1606941598
mas "Anybox", id: 1593408455 mas "Anybox", id: 1593408455
mas "Bakery", id: 1575220747 mas "Bakery", id: 1575220747
mas "Baking Soda", id: 1601151613 mas "Baking Soda", id: 1601151613
mas "Balatro+", id: 6502451661 mas "Battery Indicator", id: 1206020918
mas "Bear", id: 1091189122 mas "Bear", id: 1091189122
mas "Codye", id: 1516894961 mas "Codye", id: 1516894961
mas "Collections", id: 1568395334 mas "Collections", id: 1568395334
mas "Color Picker", id: 1545870783 mas "Color Picker", id: 1545870783
mas "CoverSutra", id: 404128139 mas "CoverSutra", id: 404128139
mas "CustomSymbols", id: 1566662030 mas "CustomSymbols", id: 1566662030
mas "Dato", id: 1470584107
mas "DevCleaner", id: 1388020431 mas "DevCleaner", id: 1388020431
mas "Developer", id: 640199958 mas "Developer", id: 640199958
mas "Dice", id: 1479250666 mas "Dice by PCalc", id: 1479250666
mas "Divinity - Original Sin 2", id: 1441532941 mas "Divinity - Original Sin 2", id: 1441532941
mas "Dropover", id: 1355679052 mas "Dropover", id: 1355679052
mas "Equinox", id: 1591510203
mas "Expenses", id: 1492055171 mas "Expenses", id: 1492055171
mas "Fantastical", id: 975937182
mas "Find Any File", id: 402569179 mas "Find Any File", id: 402569179
mas "Front and Center", id: 1493996622 mas "Front and Center", id: 1493996622
mas "Gifski", id: 1351639930 mas "Gifski", id: 1351639930
mas "GoodLinks", id: 1474335294
mas "HEIC Converter", id: 1294126402 mas "HEIC Converter", id: 1294126402
mas "HTTPBot", id: 1232603544 mas "HTTPBot", id: 1232603544
mas "Interactful", id: 1528095640 mas "Interactful", id: 1528095640
@@ -146,10 +152,10 @@ mas "Pastel", id: 413897608
mas "Photomator", id: 1444636541 mas "Photomator", id: 1444636541
mas "Pixelmator Pro", id: 1289583905 mas "Pixelmator Pro", id: 1289583905
mas "Pixen", id: 525180431 mas "Pixen", id: 525180431
mas "Pocket City 2", id: 6742559886
mas "Pure Paste", id: 1611378436 mas "Pure Paste", id: 1611378436
mas "Raycast Companion", id: 6738274497 mas "Raycast Companion", id: 6738274497
mas "Reeder", id: 6475002485 mas "Reeder", id: 6475002485
mas "Screens", id: 1224268771
mas "Shareful", id: 1522267256 mas "Shareful", id: 1522267256
mas "Sleeve", id: 1606145041 mas "Sleeve", id: 1606145041
mas "Snippety", id: 1530751461 mas "Snippety", id: 1530751461
@@ -161,5 +167,28 @@ mas "Transporter", id: 1450874784
mas "Velja", id: 1607635845 mas "Velja", id: 1607635845
mas "Vinegar", id: 1591303229 mas "Vinegar", id: 1591303229
mas "Wallaroo", id: 1630565980 mas "Wallaroo", id: 1630565980
mas "WhatsApp", id: 310633997
mas "WorldWideWeb", id: 1621370168
mas "Xcode", id: 497799835 mas "Xcode", id: 497799835
mas "WhatsApp", id: 310633997 vscode "akamud.vscode-theme-onelight"
vscode "astro-build.astro-vscode"
vscode "bradlc.vscode-tailwindcss"
vscode "christian-kohler.npm-intellisense"
vscode "csstools.postcss"
vscode "dbaeumer.vscode-eslint"
vscode "dericcain.feather"
vscode "esbenp.prettier-vscode"
vscode "icrawl.discord-vscode"
vscode "karyfoundation.theme-karyfoundation-themes"
vscode "littensy.charmed-icons"
vscode "lkytal.flatui"
vscode "llvm-vs-code-extensions.lldb-dap"
vscode "ms-vscode.theme-tomorrowkit"
vscode "oven.bun-vscode"
vscode "prisma.prisma"
vscode "rust-lang.rust-analyzer"
vscode "sdras.night-owl"
vscode "swiftlang.swift-vscode"
vscode "teabyii.ayu"
vscode "tonsky.theme-alabaster"
vscode "zguolee.tabler-icons"
+2 -2
View File
@@ -1,4 +1,4 @@
theme = light:GitLab-Light,dark:Andromeda theme = light:Tomorrow,dark:Andromeda
cursor-style = underline cursor-style = underline
shell-integration-features = no-cursor shell-integration-features = no-cursor
@@ -14,5 +14,5 @@ window-width = 120
window-padding-x = 5 window-padding-x = 5
window-padding-y = 5 window-padding-y = 5
window-padding-balance = true window-padding-balance = true
background-opacity = 0.90 background-opacity = 0.96
background-blur = true background-blur = true
+1 -23
View File
@@ -7,29 +7,7 @@ if [ -z "$COMMIT_MSG"]; then
fi fi
git add -A git add -A
git commit -m "$COMMIT_MSG" gitmoji commit
BRANCH=$(git name-rev --name-only HEAD) BRANCH=$(git name-rev --name-only HEAD)
gum confirm "Push?" && git push origin $BRANCH gum confirm "Push?" && git push origin $BRANCH
if [ "$BRANCH" = "main" || "$BRANCH" == "master" ]; then
exit 0
fi
CREATE_PR=$(gum confirm "Create PR?")
if [[ "${!#}" == "-pr" && CREATE_PR -eq 0 ]]; then
REMOTE_BRANCHES=$(git branch -r | grep -v '\//' | sed 's/origin\///')
if echo "$remote_branches" | grep -q "^beta$"; then
PR_BASE="beta"
elif echo "$remote_branches" | grep -q "^main$"; then
PR_BASE="main"
elif echo "$remote_branches" | grep -q "^master$"; then
PR_BASE="master"
else
PR_BASE=$(REMOTE_BRANCHES | gum choose --limit 1 )
fi
gh pr create --base PR_BASE
fi
+6 -10
View File
@@ -3,10 +3,11 @@
"dock": null, "dock": null,
"button": false "button": false
}, },
"icon_theme": "Material Icon Theme", "icon_theme": "Soft Charmed Icons",
"show_user_picture": false, "show_user_picture": false,
"show_edit_predictions": true, "show_edit_predictions": true,
"base_keymap": "VSCode", "base_keymap": "VSCode",
"close_on_file_delete": true,
"outline_panel": { "outline_panel": {
"dock": "right" "dock": "right"
}, },
@@ -16,10 +17,6 @@
"metrics": false "metrics": false
}, },
"agent": { "agent": {
"default_model": {
"provider": "zed.dev",
"model": "claude-3-5-sonnet-latest"
},
"version": "2", "version": "2",
"enabled": false, "enabled": false,
"dock": null "dock": null
@@ -31,9 +28,8 @@
"active_pane_modifiers": { "active_pane_modifiers": {
"inactive_opacity": 0.7 "inactive_opacity": 0.7
}, },
"redact_private_values": true,
"features": { "features": {
"edit_prediction_provider": "zed" "edit_prediction_provider": "none"
}, },
"collaboration_panel": { "collaboration_panel": {
"button": false "button": false
@@ -56,11 +52,11 @@
}, },
"theme": { "theme": {
"mode": "system", "mode": "system",
"light": "Adwaita Pastel Light", "light": "One Light",
"dark": "Ayu Dark" "dark": "Ayu Mirage"
}, },
"scrollbar": { "scrollbar": {
"show": "auto", "show": "system",
"axes": { "axes": {
"horizontal": false, "horizontal": false,
"vertical": true "vertical": true
+1
View File
@@ -24,3 +24,4 @@ alias installbrewfile="brew bundle install --file=~/dotfiles/Brewfile"
# dotfiles # dotfiles
alias config="zed ~/dotfiles" alias config="zed ~/dotfiles"
alias linkdfs="sh ~/dotfiles/symlink_dotfiles.zsh" alias linkdfs="sh ~/dotfiles/symlink_dotfiles.zsh"
alias cdot="sh ~/dotfiles/scripts/commit-dotfiles.sh"
+1 -2
View File
@@ -19,5 +19,4 @@ eval "$(atuin init zsh)"
[ -s "/Users/ghall/.bun/_bun" ] && source "/Users/ghall/.bun/_bun" [ -s "/Users/ghall/.bun/_bun" ] && source "/Users/ghall/.bun/_bun"
# Load Angular CLI autocompletion.
source <(ng completion script)