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

@@ -0,0 +1,34 @@
+ansible
+ansible-language-server
+ansible-lint
+awscli
+bat
+deno
+eza
+fd
+fzf
+git
+gleam
+go
+hashicorp/tap/consul
+hashicorp/tap/nomad
+hashicorp/tap/vault
+heroku
+htop
+oh-my-posh
+libpq
+minio/stable/minio
+neovim
+opencode
+ory/tap/hydra
+ory/tap/kratos
+oven-sh/bun/bun
+pyenv
+pyenv-virtualenv
+redis
+rust
+stow
+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

@@ -0,0 +1,21 @@
+#!/bin/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=("nvim" "tmux" "zsh" "git" "ssh")
+
+for folder in "${folders[@]}"
+do
+    echo "Symlinking $folder"
+    stow "$folder" --target ~
+done
+

nvim/.config/nvim/init.lua

@@ -778,24 +778,6 @@ require("lazy").setup({
 		end,
 	},
 
-	{ -- You can easily change to a different colorscheme.
-		-- Change the name of the colorscheme plugin below, and then
-		-- change the command in the config to whatever the name of that colorscheme is.
-		--
-		-- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
-		"folke/tokyonight.nvim",
-		priority = 1000, -- Make sure to load this before all the other start plugins.
-		init = function()
-			-- Load the colorscheme here.
-			-- Like many other themes, this one has different styles, and you could load
-			-- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
-			vim.cmd.colorscheme("tokyonight-night")
-
-			-- You can configure highlights by doing something like:
-			vim.cmd.hi("Comment gui=none")
-		end,
-	},
-
 	-- Highlight todo, notes, etc in comments
 	{
 		"folke/todo-comments.nvim",

nvim/.config/nvim/lazy-lock.json

@@ -1,29 +1,29 @@
 {
   "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
   "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
-  "catppuccin": { "branch": "main", "commit": "31fcfb02c47952d5c75aec893b93b2878abe5fbb" },
+  "catppuccin": { "branch": "main", "commit": "0b5df9c9e641b1212b21a0762ccad4434fd41322" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "cd75be867f2331b22905f47d28c0c270a69466aa" },
-  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
-  "gitsigns.nvim": { "branch": "main", "commit": "6b1a14eabcebbcca1b9e9163a26b2f8371364cb7" },
-  "lazy.nvim": { "branch": "main", "commit": "d0921f5b9b3d2c5e09618da55a018228edcc4d16" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "37a336b653f8594df75c827ed589f1c91d91ff6c" },
+  "conform.nvim": { "branch": "master", "commit": "797de8f79055334104cf77893cd93fe3fc2ac154" },
+  "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
+  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
+  "gx.nvim": { "branch": "main", "commit": "d921f21f200113fd3201194aa9dddb033e83768a" },
+  "lazy.nvim": { "branch": "main", "commit": "839f9e78e78dc935b1188fb16583365991739c51" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
   "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" },
-  "mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
-  "mini.nvim": { "branch": "main", "commit": "b8c1d3b2f4cd637760babb8a33ad12fd5afe2ee2" },
-  "neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" },
-  "nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
-  "nvim-lspconfig": { "branch": "master", "commit": "53a3c6444ec5006b567071614c83edc8ad651f6d" },
-  "nvim-treesitter": { "branch": "master", "commit": "6cd4ce6cab184e8787f164a182954534221f2af2" },
+  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
+  "mini.nvim": { "branch": "main", "commit": "23669ab7abc2cd10f9a5166de07400bb34eaecda" },
+  "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
+  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fa6c2a64100c6f692bbec29bbbc8ec2663c9e869" },
+  "nvim-treesitter": { "branch": "master", "commit": "5f5077f8f7fa545065a0846406011cd3cc49093b" },
   "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "supermaven-nvim": { "branch": "main", "commit": "c7ab94a6bcde96c79ff51afd6a1494606bb6f10b" },
+  "supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" },
   "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
   "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
-  "todo-comments.nvim": { "branch": "main", "commit": "51e10f838e84b4756c16311d0b1ef0972c6482d2" },
-  "tokyonight.nvim": { "branch": "main", "commit": "bb5214f88c96816c9a9eef95a5538b1fbbbbbc0a" },
+  "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" },
   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
-  "which-key.nvim": { "branch": "main", "commit": "0099511294f16b81c696004fa6a403b0ae61f7a0" }
-}
+  "which-key.nvim": { "branch": "main", "commit": "977fa23622425e3c8ae837b9f7c710d9c78bdeab" }
+}

nvim/.config/nvim/lua/plugins/gx.lua

@@ -0,0 +1,23 @@
+return {
+	"chrishrb/gx.nvim",
+	keys = { { "<Leader>o", "<cmd>Browse<cr>", mode = { "n", "x", "v" } } },
+	cmd = { "Browse" },
+	init = function()
+		vim.g.netrw_nogx = 1 -- disable netrw gx
+	end,
+	dependencies = { "nvim-lua/plenary.nvim" },
+
+	config = function()
+		require("gx").setup({
+			open_browser_app = "open",
+			open_browser_args = { "--background" },
+			handlers = {
+				search = true,
+			},
+			handler_options = {
+				search_engine = "https://search.brave.com/search?q=",
+				select_for_search = "false",
+			},
+		})
+	end,
+}

nvim/.config/nvim/vimrc.vim

@@ -8,8 +8,21 @@ set expandtab
 set smartindent
 
 colorscheme catppuccin-mocha
- 
+
 let mapleader=" "
-nnoremap <leader>pv :Vex<CR>
-nnoremap <leader><CR> :so ~/.config/nvim/vimrc.vim<CR>
 nnoremap <leader>e :Ex<CR>
+nnoremap <leader>pv :Vex<CR>
+nnoremap <leader>s<CR> :w<CR>
+nnoremap <leader><CR> :so ~/.config/nvim/vimrc.vim<CR>
+
+" Toggle Supermaven plugin
+nnoremap <leader>sm :SupermavenToggle<CR>
+
+" Helpful Movment Mappings
+" Check out https://sidneyliebrand.medium.com/a-collection-of-vim-key-binds-4d227c9a455
+noremap J 10j 
+noremap K 10k
+noremap H ^
+noremap L $
+
+vmap <leader>c gc

ssh/.ssh/config

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

zsh/.config/fd/ignore

@@ -0,0 +1 @@
+/.git

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

@@ -1,67 +0,0 @@
-{
-  "$schema": "https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json",
-  "palette": {
-        "os": "#ACB0BE",
-        "closer": "p:os",
-        "pink": "#F5C2E7",
-        "lavender": "#B4BEFE",
-        "blue":  "#89B4FA"
-  },
-  "blocks": [
-    {
-      "alignment": "left",
-      "segments": [
-        {
-          "foreground": "p:os",
-          "style": "plain",
-          "template": "{{.Icon}} ",
-          "type": "os"
-        },
-        {
-          "foreground": "p:blue",
-          "style": "plain",
-          "template": "{{ .UserName }} ",
-          "type": "session"
-        },
-        {
-          "foreground": "p:pink",
-          "properties": {
-            "folder_icon": "..\ue5fe..",
-            "home_icon": "~",
-            "style": "agnoster_short"
-          },
-          "style": "plain",
-          "template": "{{ .Path }} ",
-          "type": "path"
-        },
-        {
-          "foreground": "p:lavender",
-          "properties": {
-            "branch_icon": "\ue725 ",
-            "cherry_pick_icon": "\ue29b ",
-            "commit_icon": "\uf417 ",
-            "fetch_status": false,
-            "fetch_upstream_icon": false,
-            "merge_icon": "\ue727 ",
-            "no_commits_icon": "\uf0c3 ",
-            "rebase_icon": "\ue728 ",
-            "revert_icon": "\uf0e2 ",
-            "tag_icon": "\uf412 "
-          },
-          "template": "{{ .HEAD }} ",
-          "style": "plain",
-          "type": "git"
-        },
-        {
-          "style": "plain",
-          "foreground": "p:closer",
-          "template": "\uf105",
-          "type": "text"
-        }
-      ],
-      "type": "prompt"
-    }
-  ],
-  "final_space": true,
-  "version": 2
-}

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

@@ -0,0 +1,90 @@
+version = 3
+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]]
+    leading_diamond = ''
+    template = '{{ .UserName }}@{{ .HostName }}'
+    foreground = 'p:text'
+    powerline_symbol = ''
+    trailing_diamond = ''
+    background = 'p:blue'
+    type = 'session'
+    style = 'diamond'
+
+    [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'
+
+    [blocks.segments.properties]
+      branch_icon = ' '
+      cache_duration = 'none'
+      cherry_pick_icon = ' '
+      commit_icon = ' '
+      fetch_status = false
+      fetch_upstream_icon = false
+      merge_icon = ' '
+      no_commits_icon = ' '
+      rebase_icon = ' '
+      revert_icon = ' '
+      tag_icon = ' '
+
+      [blocks.segments.properties.mapped_branches]
+        'docs/*' = '📚 '
+        'feat/*' = '🚀 '
+        'fix/*' = '🐛 '

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,35 +11,52 @@ 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 ----
-alias vi="nvim"
-alias vim="nvim"
-alias cat="bat"
-alias find="fd -H"
-alias ls="eza --color=always --git --no-filesize --icons=always --no-time --no-user --no-permissions"
-alias cd="z"
+/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"
+/usr/bin/which -s fd && alias find="fd -H" || echo "fd not found, falling back to find"
+/usr/bin/which -s zoxide && alias cd="z" || echo "zoxide not found, falling back to cd"
+/usr/bin/which -s eza && alias ls="eza --color=always --git --no-filesize --icons=always --no-time --no-user --no-permissions" || echo "eza not found, falling back to ls"
+
+# ---- SSH Agent (1Password) ----
+# https://developer.1password.com/docs/ssh/get-started/#step-3-turn-on-the-1password-ssh-agent
+export SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock
 
 # ---- SSH Shortcuts ----
 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
-	eval "$(oh-my-posh init zsh --config ~/.config/oh-my-posh/theme.json)"
+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)"
 
-# ---- Auto Enter TMUX ----
-if [ -z "$TMUX" ]
-then
-    tmux attach -t TMUX || tmux new -s TMUX
-fi
+# ---- ZSH Plugins ----
+source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+# bun completions
+[ -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"
+
+# opencode
+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