chore: getting back into sync

.config/zsh/homebrew.zsh##os.Darwin

@@ -1,5 +1,5 @@
 export PATH="/usr/local/sbin:$PATH"
 
-alias hbu="brew outdated | sort | fzf --no-sort --height 50% --header 'Homebrew Upgrade' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew upgrade {}"
-alias hbx="brew list | sort | fzf --no-sort --height 50% --header 'Homebrew Uninstall' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew uninstall {}"
-alias hbi="brew list | sort | fzf --no-sort --height 50% --header 'Homebrew Installed Packages' --reverse -m --border --preview 'sleep 1 && brew info {}'"
+alias hbu="brew outdated 2> /dev/null | sort | fzf --no-sort --height 50% --header 'Homebrew Upgrade' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew upgrade {}"
+alias hbx="brew list 2> /dev/null | sort | fzf --no-sort --height 50% --header 'Homebrew Uninstall' --reverse -m --border --preview 'sleep 1 && brew info {}' | xargs -I '{}' brew uninstall {}"
+alias hbi="brew list 2> /dev/null | sort | fzf --no-sort --height 50% --header 'Homebrew Installed Packages' --reverse -m --border --preview 'sleep 1 && brew info {}'"

.config/zsh/vim.zsh

@@ -7,3 +7,4 @@ else
 fi
 
 export EDITOR="nvim"
+alias nvim="nvm use v16 && /Users/tedkulp/.asdf/shims/nvim"

.gitconfig

@@ -11,3 +11,5 @@
 	rebase = false
 [tag]
 	forceSignAnnotated = true
+[alias]
+	mdr = merge --no-commit --no-ff

.tmux.conf.local

@@ -409,19 +409,34 @@ set -g @plugin 'laktak/extrakto'
 # WARNING: hex colors can't contain capital letters
 
 # --> Catppuccin
-thm_bg="#1e1e28"
-thm_fg="#dadae8"
-thm_cyan="#c2e7f0"
-thm_black="#15121c"
-thm_gray="#332e41"
-thm_magenta="#c6aae8"
-thm_pink="#e5b4e2"
-thm_red="#e38c8f"
-thm_green="#b1e3ad"
-thm_yellow="#ebddaa"
-thm_blue="#a4b9ef"
-thm_orange="#f9c096"
-thm_black4="#575268"
+# thm_bg="#1e1e28"
+# thm_fg="#dadae8"
+# thm_cyan="#c2e7f0"
+# thm_black="#15121c"
+# thm_gray="#332e41"
+# thm_magenta="#c6aae8"
+# thm_pink="#e5b4e2"
+# thm_red="#e38c8f"
+# thm_green="#b1e3ad"
+# thm_yellow="#ebddaa"
+# thm_blue="#a4b9ef"
+# thm_orange="#f9c096"
+# thm_black4="#575268"
+
+# --> Catppuccin (Mocha)
+thm_bg="#1e1e2e"
+thm_fg="#cdd6f4"
+thm_cyan="#89dceb"
+thm_black="#181825"
+thm_gray="#313244"
+thm_magenta="#cba6f7"
+thm_pink="#f5c2e7"
+thm_red="#f38ba8"
+thm_green="#a6e3a1"
+thm_yellow="#f9e2af"
+thm_blue="#89b4fa"
+thm_orange="#fab387"
+thm_black4="#585b70"
 
 # ----------------------------=== Theme ===--------------------------
 

.zshrc

@@ -1,5 +1,8 @@
-export PATH="${PATH}:${HOME}/.local/bin"
+# zmodload zsh/zprof
 
+export PATH="${PATH}:${HOME}/.local/bin"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export ENHANCD_FILTER=fzy:fzf:peco
 
 # zmodload zsh/zprof
 ZSH_DISABLE_COMPFIX=true
@@ -8,7 +11,8 @@ setopt HIST_IGNORE_SPACE
 # export PATH=$HOME/bin:/usr/local/bin:$PATH
 
 # Path to your oh-my-zsh installation.
-export ZSH="$HOME/.oh-my-zsh"
+#export ZSH="$HOME/.oh-my-zsh"
+export ZSH="${HOME}/.local/share/sheldon/repos/github.com/ohmyzsh/ohmyzsh"
 
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time oh-my-zsh is loaded, in which case,
@@ -77,9 +81,10 @@ fi
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(vi-mode git fzf aws vscode dash zoxide thefuck zsh-syntax-highlighting jq forgit)
+# plugins=(vi-mode git fzf aws vscode dash zoxide thefuck zsh-syntax-highlighting jq forgit)
+plugins=(vi-mode git fzf aws dash zoxide zsh-syntax-highlighting jq sd)
 
-source $ZSH/oh-my-zsh.sh
+#source $ZSH/oh-my-zsh.sh
 
 # User configuration
 
@@ -111,9 +116,17 @@ source $ZSH/oh-my-zsh.sh
 # uninstall by removing these lines
 # [ -f ~/.config/tabtab/__tabtab.fish ]; and . ~/.config/tabtab/__tabtab.fish; or true
 
+eval "$(sheldon source)"
 source <("/usr/local/bin/starship" init zsh --print-full-init)
 
 # zprof
 
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
+
+# zprof
+
+# pnpm
+export PNPM_HOME="/Users/tedkulp/Library/pnpm"
+export PATH="$PNPM_HOME:$PATH"
+# pnpm end