Automatic update 17:59:23 10/30/24

dotfiles/.gitconfig

@@ -1,27 +1,30 @@
 [user]
-	name = Wes Rupert
-	email = [email protected]
+  name = Wes Rupert
+  email = [email protected]
 [core]
   excludesfile = "~/.config/.gitignore_global"
   editor = nvim
+  pager = delta
   autocrlf = input
   eol = lf
 [diff]
   tool = nvimdiff
 [difftool "nvimdiff"]
   cmd = "nvim -d \"$LOCAL\" \"$REMOTE\""
-[difftool "vimrdiff"]
-  cmd = "vimr --wait --nvim -d \"$LOCAL\" \"$REMOTE\""
+[merge]
+  tool = nvimdiff
 [mergetool]
   keepBackup = false
+[mergetool "nvimdiff"]
+  layout = LOCAL,MERGED,REMOTE
 [format]
   pretty = oline
 [pretty]
   oline = %Cred%h%Creset %s %Cgreen%cr%Creset %C(bold blue)<%an>%Creset%C(yellow)%d%Creset
   sline = - %s (%Cred%h%Creset)
   tline = %Cred%h%Creset%C(yellow)%d%Creset %Cgreen%cr%Creset %C(bold blue)<%an>%Creset%n%w(80,0,0)%s%n
   pbody = %Cred%h%Creset%C(yellow)%d%Creset %Cgreen%cr%Creset %C(bold blue)<%an>%Creset%n%w(80,0,0)%s%n%n%b
-  hashs = %Cred%H%Creset %s %Cgreen%cr%Creset %C(bold blue)<%an>%Creset%C(yellow)%d%Creset
+  hashes = %Cred%H%Creset %s %Cgreen%cr%Creset %C(bold blue)<%an>%Creset%C(yellow)%d%Creset
 [pull]
   rebase = true
 [push]
@@ -30,7 +33,7 @@
 [status]
   showUntrackedFiles = all
 [interactive]
-  diffFilter = diff-highlight
+  diffFilter = delta --color-only
 [rebase]
   autoStash = true
 [safe]
@@ -42,6 +45,16 @@
   required = true
 [advice]
   setUpstreamFailure = false
+[delta]
+  navigate = true
+  line-numbers = true
+  light = true
+[delta "light"]
+  light = true
+  dark = false
+[delta "dark"]
+  light = false
+  dark = true
 [alias]
   # View all aliases in your terminal
   alias = ! git config --get-regexp ^alias\\. | sed -e s/^alias\\.// -e s/\\ /\\ =\\ /
@@ -78,7 +91,7 @@
   # Quick log aliases.
   logb           = "log --pretty=pbody"
   logg           = "log --decorate --graph"
-  logh           = "log --pretty=hashs"
+  logh           = "log --pretty=hashes"
   logl           = "log --branches --not --remotes"
   logs           = "log --pretty=sline"
   logt           = "log --pretty=tline"

dotfiles/.tmux.conf

@@ -1,11 +1,8 @@
-# I don't use the status bar
-set -g status off
-set -g default-terminal "xterm"
-
 # Better activation key
 unbind C-b
 set-option -g prefix C-a
 bind-key C-a send-prefix
+setw -g mode-keys vi
 
 # Better split pane commands
 unbind '"'
@@ -14,13 +11,30 @@ unbind %
 bind h split-window -v
 
 # Switch panes
-bind -n C-h select-pane -L
-bind -n C-j select-pane -D
-bind -n C-k select-pane -U
-bind -n C-l select-pane -R
+bind C-h select-pane -L
+bind C-j select-pane -D
+bind C-k select-pane -U
+bind C-l select-pane -R
+
+# Layouts
+bind C-l split-window -h \; split-window -v \; select-layout main-horizontal
+
+# I don't use the status bar
+set -g status off
+
+# True color support
+set -g default-terminal "tmux-256color"
+set -ag terminal-overrides ",xterm-256color:RGB"
 
 # Enable mouse mode
 set -g mouse on
 
+# Enable activity alerts
+setw -g monitor-activity on
+set -g visual-activity on
+
+# Center the window list
+set -g status-justify centre
+
 # Reload hotkey
-bind r source-file ~/.tmux.conf \; display "Reloaded config"
+bind r source-file ~/.tmux.conf \; display "Reloaded config"

dotfiles/.zprofile

@@ -1,15 +1,14 @@
 source "$HOME/.zshrc.before"
 
-export PATH=$PATH:$HOME/bin
-export PATH=$PATH:$HOME/platform-tools
-export PATH=$PATH:$HOME/.dotfiles/git-diffall
-export PATH=$PATH:$HOME/.pyenv/bin
-export PATH=$PATH:$HOME/.rbenv/bin
-export PATH=$PATH:$HOME/.local/share/fnm:$PATH
-export PATH=$PATH:$HOME/.yarn/bin
-export PATH=$PATH:$HOME/.config/yarn/global/node_modules/.bin
-export PATH=$PATH:$HOME/.local/bin
-export PATH=$PATH:$HOME/.local/share/fnm
-export PATH=$PATH:$HOME/.local/share/phpenv/bin
-export PATH=$PATH:$HOME/.composer/vendor/bin
-export PATH=$PATH:/usr/local/bin/python
+export PATH=$HOME/bin:$PATH
+export PATH=$HOME/platform-tools:$PATH
+export PATH=$HOME/.dotfiles/git-diffall:$PATH
+export PATH=$HOME/.pyenv/bin:$PATH
+export PATH=$HOME/.rbenv/bin:$PATH
+export PATH=$HOME/.yarn/bin:$PATH
+export PATH=$HOME/.config/yarn/global/node_modules/.bin:$PATH
+export PATH=$HOME/.local/bin:$PATH
+export PATH=$HOME/.local/share/mise/shims:$PATH
+export PATH=$HOME/.composer/vendor/bin:$PATH
+export PATH=/usr/local/bin/python:$PATH
+export PATH=/usr/local/share/nvim/bin:$PATH

dotfiles/.zshrc

@@ -1,12 +1,10 @@
 function try_source { if [[ -e "$1" ]]; then source "$1"; fi }
 function exists { command -v "$1" >/dev/null 2>&1; return $? }
 
-export DISABLE_AUTO_UPDATE='true'
+# export DISABLE_AUTO_UPDATE='true'
 
 # TODO: Support multiple additional imports
-try_source "$HOME/.zshrc.before"
 try_source "$ZSH_ADDITIONAL_IMPORTS"
-
 try_source "$HOME/.iterm2_shell_integration.zsh"
 
 export ZSH="$HOME/.oh-my-zsh"
@@ -32,9 +30,10 @@ fi
 
 # Run this check early so that we don't do extra work if we're relaunching
 if exists tmux; then
-  if [[ -z "$TMUX" && "$SESSION_TYPE" == remote/ssh ]]; then
+  # if [[ -z "$TMUX" && "$SESSION_TYPE" == remote/ssh ]]; then
+  if [[ -z "$TMUX" ]]; then
     export ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX=1
-    TERM=screen-256color-bce
+    TERM=xterm-256color
     sid="$(tmux ls | sed '/(attached)$/d' | sed 's/:.*//' | tail -n 1)"
     tmux ${ITERM_SHELL_INTEGRATION_INSTALLED:+-CC} ${sid:+attach} ${sid:+-t} $sid
     exit
@@ -53,11 +52,13 @@ ENABLE_CORRECTION='true'
 COMPLETION_WAITING_DOTS='true'
 setopt globdots
 
-if [[ -f "$HOME/.fzf.zsh" ]]; then
+if exists fzf; then
   export FZF_COMPLETION_TRIGGER='qq'
   export FZF_DEFAULT_COMMAND='rg --files --hidden --follow 2>/dev/null'
   export FZF_DEFAULT_OPTS="--height 40% --reverse --border"
-  source "$HOME/.fzf.zsh"
+  if [[ -f "$HOME/.fzf.zsh" ]]; then
+    source "$HOME/.fzf.zsh"
+  fi
 
   function fzf() {
     if [[ $(tput cols) > 100 ]]; then
@@ -168,6 +169,20 @@ function kill-port {
     echo "$(lsof -t -i tcp:$1 | wc -l) processes remaining"
 }
 
+function delta-colorscheme {
+  if [[ -z "$1" ]]; then
+    if [[ "$DELTA_FEATURES" == '+light' ]]; then
+      echo 'Delta: Switching to dark colorscheme'
+      export DELTA_FEATURES='+dark'
+    else
+      echo 'Delta: Switching to light colorscheme'
+      export DELTA_FEATURES='+light'
+    fi
+  else
+    export DELTA_FEATURES="+$1"
+  fi
+}
+
 if [[ -n "$TMUX" ]]; then
   alias detach='tmux detach'
 fi
@@ -199,5 +214,6 @@ try_source "$HOME/.zshrc.after"
 [ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
-eval "`fnm env --use-on-cd`"
-eval "$(phpenv init -)"
+[ -f ~/.local/bin/mise ] && eval "$(~/.local/bin/mise activate zsh)"
+# exists fnm && eval "`fnm env --use-on-cd`"
+# exists phpenv && eval "$(phpenv init -)"