lingering changes

Author: ajjahn

Brewfile

@@ -1,32 +1,39 @@
 # frozen_string_literal: true
 
 # vi:ft=ruby:
-tap "homebrew/services"
-tap "thoughtbot/formulae"
-tap "universal-ctags/universal-ctags"
+
+tap "autozimu/homebrew-formulas" # unison-fsmonitor
 tap "aws/tap"
-tap "homebrew/cask-versions"
+tap "itchyny/tap" # git-branch-name
+tap "thoughtbot/formulae" # rcm
+tap "universal-ctags/universal-ctags"
+tap "wyne/tap" # fasder
 
 # Utils
 brew "ag"
 brew "asdf"
 brew "aws-sam-cli"
+brew "awscli"
+brew "bandwhich"
 brew "bat"
+brew "carthage" # Dependencies for Cocoa
 brew "cmake"
+brew "colima"
 brew "direnv"
+brew "docker"
 brew "efm-langserver"
 brew "elixir"
 brew "entr"
 brew "eza"
-brew "wyne/tap/fasder"
+brew "fasder"
 brew "fd"
 brew "ffmpeg"
 brew "ffmpegthumbnailer"
 brew "fish"
 brew "fzf"
 brew "gh"
-# brew "gdb" not available on apple silicon
 brew "git"
+brew "git-branch-name"
 brew "gnupg"
 brew "golang"
 brew "graphviz"
@@ -37,6 +44,7 @@ brew "imagemagick"
 brew "jq"
 brew "lima"
 brew "lua-language-server"
+brew "marksman" # markdown language server
 brew "neovim"
 brew "node"
 brew "pinentry-mac"
@@ -46,6 +54,7 @@ brew "rbenv"
 brew "rcm"
 brew "reattach-to-user-namespace"
 brew "ripgrep"
+brew "ruff"
 brew "rust-analyzer"
 brew "shellcheck"
 brew "shfmt"
@@ -54,46 +63,49 @@ brew "tldr"
 brew "tmux"
 brew "tree"
 brew "unison"
-brew "autozimu/homebrew-formulas/unison-fsmonitor"
-brew "universal-ctags"
+brew "unison-fsmonitor"
+brew "uv"
 brew "watch"
 brew "wget"
+brew "wireguard-tools"
 brew "yaml-language-server"
 brew "yarn"
-brew "youtube-dl"
 brew "yq"
+brew "yt-dlp"
 brew "zlib"
-brew "colima"
-brew "docker"
 
 # Garbage Heap?
-# brew "awscli"
-# brew "gnupg21"
-# brew "docker"
 # brew "docker-compose"
 # brew "docker-machine"
+# brew "gdb" not available on apple silicon
+# brew "gnupg21"
+# brew "nerdctl"
+# brew "universal-ctags"
 # brew "willgit"
 
 # Applications
 cask "alacritty"
-cask "dash"
 cask "firefox"
-cask "google-chrome"
 cask "gpg-suite"
 cask "imagealpha"
 cask "imageoptim"
 cask "iterm2"
+cask "ngrok"
 cask "obsidian"
-cask "rowanj-gitx"
-cask "sequel-pro"
-cask "slack"
+cask "gitx"
 cask "transmission"
+cask "utm"
 cask "vagrant"
-cask "virtualbox"
-cask "xquartz"
-cask "zoom"
+# cask "virtualbox-beta"
+# cask "virtualbox-extension-pack-beta"
+# cask "slack"
 
 # Garbage Heap?
-# cask "psequel"
-# cask "osxfuse"
+# cask "dash"
+# cask "google-chrome"
 # cask "macfuse"
+# cask "osxfuse"
+# cask "psequel"
+# cask "sequel-pro"
+# cask "xquartz"
+# cask "zoom"

install/python-packages

@@ -12,7 +12,6 @@ PACKAGES=(
   black
   isort
   pyright
-  ruff
 )
 
 pip3 install "${PACKAGES[@]}"

sources/brew

@@ -54,3 +54,6 @@ fp() {
     fp
   fi
 }
+
+export C_INCLUDE_PATH=$(brew --prefix)/include
+export LIBRARY_PATH=$(brew --prefix)/lib

sources/fasd

@@ -0,0 +1,30 @@
+#!/usr/bin/env zsh
+
+# check if fasd is installed
+if (( ${+commands[fasd]} )); then
+  fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache"
+  if [[ "$commands[fasd]" -nt "$fasd_cache" || ! -s "$fasd_cache" ]]; then
+    fasd --init posix-alias zsh-hook zsh-ccomp zsh-ccomp-install \
+      zsh-wcomp zsh-wcomp-install >| "$fasd_cache"
+  fi
+  source "$fasd_cache"
+  unset fasd_cache
+
+  alias v='f -e "$EDITOR"'
+  alias o='a -e xdg-open'
+  alias j='zz'
+fi
+
+# check if fasder is installed (macOs)
+if (( ${+commands[fasder]} )); then
+  alias fasd="fasder"
+
+  fasd_cache="${ZSH_CACHE_DIR}/fasd-init-cache"
+  if [[ "$commands[fasder]" -nt "$fasd_cache" || ! -s "$fasd_cache" ]]; then
+    fasd --init auto aliases >| "$fasd_cache"
+  fi
+  source "$fasd_cache"
+  unset fasd_cache
+fi
+
+

sources/paths

@@ -1,7 +1,3 @@
-# Customs
-export PATH="$PATH:$HOME/.bin"
-export PATH="$PATH:/usr/local/sbin"
-
 # Node
 # export PATH="`npm bin -g`:$PATH" # npm
 # export PATH="$PATH:`yarn global bin`" # yarn
@@ -47,3 +43,8 @@ export PATH="$HOME/.cargo/bin:$PATH"
 # Dedup PATH:
 # export PATH="$(echo $PATH | tr ':' '\n' | awk '!a[$0]++' | tr '\n' ':')"
 export PATH="$(echo $PATH | awk -v RS=: -v ORS=: '!($2 in a) {a[$0]; print}')"
+
+# Customs
+export PATH="$HOME/.bin:$PATH"
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$PATH:/usr/local/sbin"

sources/telemetry

@@ -0,0 +1,3 @@
+# vi:ft=bash:
+export NEXT_TELEMETRY_DISABLED=1
+export SAM_CLI_TELEMETRY=0

zshrc

@@ -33,10 +33,17 @@ source ~/.env
 # Example format: plugins=(rails git textmate ruby lighthouse)
 
 export VI_MODE_SET_CURSOR=true
-plugins=(git bundler macos vi-mode history-substring-search fzf tmux zsh-interactive-cd)
+plugins=(git macos vi-mode history-substring-search fzf tmux zsh-interactive-cd)
 
 source $ZSH/oh-my-zsh.sh
 
+# speed up git prompt info (manually run `git status` in the repository fixes
+# this)
+function git_prompt_info() {
+  ref=$(git-branch-name -q -h 12 -b 64) || return
+  echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+}
+
 # cd into projets faster
 # make sure to prepend the current directory '.'
 export CDPATH=.:~/Code