Update shell theme to better communicate the current path and git repo we're in

.config/opencode/opencode.json

@@ -0,0 +1,7 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  // Theme configuration
+  "theme": "system",
+  "model": "qwen-3-coder-480b",
+  "autoupdate": true,
+}

brewlist

@@ -1,34 +1,34 @@
 ansible
 ansible-language-server
 ansible-lint
+awscli
 bat
-black
-caddy
 deno
 eza
 fd
 fzf
-Git
+git
 gleam
 go
 hashicorp/tap/consul
 hashicorp/tap/nomad
 hashicorp/tap/vault
-Stop
+heroku
+htop
 oh-my-posh
 libpq
 minio/stable/minio
 neovim
+opencode
 ory/tap/hydra
 ory/tap/kratos
 oven-sh/bun/bun
-pnpm
+pyenv
-postgresql@16
+pyenv-virtualenv
-python@3.11
 redis
 rust
-seaweedfs
 stow
-tmux
 yamllint
 zoxide
+zsh-autosuggestions
+zsh-syntax-highlighting

casklist

@@ -0,0 +1,12 @@
+font-lilex
+font-fira-code-nerd-font
+font-fira-mono-nerd-font
+figma
+1password-cli
+linear-linear
+netnewswire
+raindropio
+docker-desktop
+utm
+cursor
+zed

git/.config/git/config

@@ -0,0 +1,14 @@
+# Git configuration
+#
+# This file is for system configurations for git.
+#
+# For user configurations, see
+# https://git-scm.com/docs/git-config
+
+[user]
+    name = Caleb Braaten
+    email = git@cbraaten.dev
+
+[includeif "gitdir:~/work/"]
+    path = ~/work/.gitconfig
+

git/work/.gitconfig

@@ -0,0 +1,3 @@
+[user]
+    email = caleb@flip.app
+

install

@@ -1,17 +1,17 @@
 #!/bin/sh
 
-# Install Brew
-NONINTERACTIVE=1 /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
-
 # Set Homebrew Taps
 brew tap hasicorp/tap
+brew tap heroku/brew
 
 # Install Brew Packages
 xargs brew install < brewlist
 
+# Install Brew Casks
+xargs brew install --cask < casklist
 
 # Sym Link Configs
-folders=("alacritty" "nvim" "tmux" "zsh")
+folders=("nvim" "tmux" "zsh" "git" "ssh")
 
 for folder in "${folders[@]}"
 do

nvim/.config/nvim/vimrc.vim

@@ -20,8 +20,8 @@ nnoremap <leader>sm :SupermavenToggle<CR>
 
 " Helpful Movment Mappings
 " Check out https://sidneyliebrand.medium.com/a-collection-of-vim-key-binds-4d227c9a455
-noremap J }
+noremap J 10j 
-noremap K {
+noremap K 10k
 noremap H ^
 noremap L $
 

ssh/.ssh/config

@@ -0,0 +1,3 @@
+Include ~/.ssh/1Password/config
+Host *
+    IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock"

zsh/.config/oh-my-posh/theme.toml

@@ -1,53 +1,79 @@
-#:schema https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json
+version = 3
-
-version = 2
 final_space = true
 
+[palette]
+  blue = '#8AADF4'
+  lavender = '#B7BDF8'
+  teal = '#8BD5CA'
+  os = '#ACB0BE'
+  pink = '#F5BDE6'
+  text = '#494D64'
+  wight = '#FFFFFF'
+
 [[blocks]]
   type = 'prompt'
   alignment = 'left'
 
   [[blocks.segments]]
-    type = 'session'
-    style = 'diamond'
-    powerline_symbol = ''
     leading_diamond = ''
     template = '{{ .UserName }}@{{ .HostName }}'
+    foreground = 'p:text'
+    powerline_symbol = ''
+    trailing_diamond = ''
     background = 'p:blue'
-    foreground = 'p:text'
+    type = 'session'
-    Text = ''
+    style = 'diamond'
-    Duration = 0
-    NameLength = 0
-
-  [[blocks.segments]]
-    type = 'path'
-    style = 'powerline'
-    powerline_symbol = ''
-    template = ' {{ .Path }}'
-    background = 'p:pink'
-    foreground = 'p:text'
-    Text = ''
-    Duration = 0
-    NameLength = 0
 
     [blocks.segments.properties]
+      cache_duration = 'none'
+
+[[blocks.segments]]
+    template = ' {{ .Segments.Git.RepoName }}'
+    foreground = 'p:text'
+    background = 'p:teal'
+    type = 'text'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    template = '{{ if .Segments.Git.RepoName }}{{ if eq .Segments.Git.Dir .PWD }}./{{ else if contains "/" .Segments.Git.RelativeDir }}.//{{ .Folder }}{{ else }}./{{ .Folder }}{{ end }}{{ end }}'
+    foreground = 'p:text'
+    powerline_symbol = ''
+    background = 'p:pink'
+    type = 'text'
+    style = 'powerline'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
+
+  [[blocks.segments]]
+    template = '{{ if not .Segments.Git.RepoName }} {{ .Path }}{{ end }}'
+    foreground = 'p:text'
+    powerline_symbol = ''
+    trailing_diamond = ''
+    background = 'p:pink'
+    type = 'path'
+    style = 'diamond'
+
+    [blocks.segments.properties]
+      cache_duration = 'none'
       folder_icon = ''
       home_icon = '~'
       style = 'agnoster_short'
 
   [[blocks.segments]]
+    template = ' {{ .HEAD }}'
+    foreground = 'p:text'
+    powerline_symbol = ''
+    background = 'p:lavender'
     type = 'git'
     style = 'powerline'
-    powerline_symbol = ''
-    template = ' {{ .HEAD }}'
-    background = 'p:lavender'
-    foreground = 'p:text'
-    Text = ''
-    Duration = 0
-    NameLength = 0
 
     [blocks.segments.properties]
       branch_icon = ' '
+      cache_duration = 'none'
       cherry_pick_icon = ' '
       commit_icon = ' '
       fetch_status = false
@@ -58,10 +84,7 @@ final_space = true
       revert_icon = ' '
       tag_icon = ' '
 
-[palette]
+      [blocks.segments.properties.mapped_branches]
-  blue = '#8AADF4'
+        'docs/*' = '📚 '
-  lavender = '#B7BDF8'
+        'feat/*' = '🚀 '
-  os = '#ACB0BE'
+        'fix/*' = '🐛 '
-  pink = '#F5BDE6'
-  text = '#494D64'
-  wight = '#FFFFFF'

zsh/.zshrc

@@ -1,3 +1,6 @@
+# ---- Homebrew ----
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
 # ---- Version Managers ----
 export NVM_DIR="$HOME/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
@@ -8,6 +11,9 @@ command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init -)"
 eval "$(pyenv virtualenv-init -)"
 
+# ---- Bun Global Installs ----
+export PATH="/Users/caleb/.bun/bin:$PATH"
+
 # ---- Native Command Overwrites ----
 /usr/bin/which -s nvim && alias vi="nvim" && alias vim="nvim" || echo "nvim not found, falling back to vi"
 /usr/bin/which -s bat && alias cat="bat" || echo "bat not found, falling back to cat"
@@ -24,25 +30,33 @@ alias pandora="ssh root@pandora.cortex.io"
 alias miranda="ssh root@miranda.cortex.io"
 
 # ---- convenience commands ----
-alias editShell="nvim ~/.zshrc"
+alias editShell="vi ~/.zshrc"
 alias sourceShell="source ~/.zshrc"
 
 export NOMAD_ADDR=http://pandora.cortex.io:4646
 export PATH="/opt/homebrew/opt/libpq/bin:$PATH"
 
 # ---- Oh-My-Posh ----
-if [ "$TERM_PROGRAM" != "Apple_Terminal" ]; then
+if [ "$TERM_PROGRAM" != "Apple_Terminal" ] && [ "$TERM_PROGRAM" != "zed" ]; 
+then
     eval "$(oh-my-posh init zsh --config ~/.config/oh-my-posh/theme.toml)"
 fi
 
 # ---- Zoxide (better cd) ----
 eval "$(zoxide init zsh)"
 
-# ---- Homebrew ----
+# ---- ZSH Plugins ----
-eval "$(/opt/homebrew/bin/brew shellenv)"
+source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
-# ---- Auto Enter TMUX ----
+# bun completions
-if [ -z "$TMUX" ]
+[ -s "/opt/homebrew/Cellar/bun/1.1.26/share/zsh/site-functions/_bun" ] && source "/opt/homebrew/Cellar/bun/1.1.26/share/zsh/site-functions/_bun"
-then
+
-    tmux attach -t TMUX || tmux new -s TMUX
+# opencode
-fi
+export PATH=/Users/caleb/.opencode/bin:$PATH
+
+# The following lines have been added by Docker Desktop to enable Docker CLI completions.
+fpath=(/Users/caleb/.docker/completions $fpath)
+autoload -Uz compinit
+compinit
+# End of Docker CLI completions