Nightly dotfiles update

.gitignore

@@ -6,10 +6,11 @@ configstore
 hub
 
 vim/vim.symlink/.netrwhist
-vim/vim.symlink/bundle
+vim/vim.symlink/plugged
+vim/vim.symlink/plugged-update
 
-nvim/nvim.symlink/plugged
 nvim/nvim.symlink/.netrwhist
+nvim/nvim.symlink/plugged
 nvim/nvim.symlink/plugged-update
 
 zsh/zsh.symlink/liquidprompt

bat/bat.xdg.symlink/config

@@ -0,0 +1,2 @@
+--style="numbers,changes,header"
+--theme="ansi"

git/gitconfig.symlink

@@ -1,6 +1,7 @@
 [core]
     excludesfile = ~/.gitignore
     editor = nvim
+    pager = delta
     autocrlf = input
     fileMode = false
 
@@ -9,6 +10,9 @@
     email = me@maxbucknell.com
     signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDHQK3AUkoorhSGqIICrSRYJJ8XCF1sKJ45CEwHLQePpBCZfCty4dbhqVTWFbyDcL1P1kKTcoljg0JmyjjJPM9IUTjFD1ruGU2rAB7aTZ4s5j2x6kVTdNyGnHOn8wy/tJC5O6R2sDjcbJWuIAw3q47bpZ8Ro/ehvvZSYJ3U+sb8kZ9XstoNDhanego4NTFd3D9F6RWJGn11/+NGuhKDq5S0knnOcC80QLgdMyVI/t/mgIWfUjAa48FUBj/ofC93a7cJLPE3bMBiUV7B2K9lPrymvQzGo+5whHmvS580cAB6y3XJodqWSocrfKZO5b8WwqjcLcVQ3u+qg9M+DUaP9fvlGs/MDsG+pyImxvsy9FL4CSUF6UB4X6bBuz4zf0p2icbdtm5/tlApw9sH6GmC+t/6514L2tqpo88puXUof4H53EcaWY/RSvb2exKCa7DOq13DgD0E2EZl6rOAezy3mvUuX7b3plMtKZ5keQEINyqclqb/1BRuHEYssh84Wmr4G2wRdbX6IYCU5KCJ6HqVL3YFv6zA5YFKqgBYA3/APsduCGawT204cG1juSQvA+VF5Le4P9L717Imawa8Se/1ROiafCPrxGEp3fHFM+D7OQAy3y0wn1yeSwNdRAyHZsLEVozJ4KSwWBCfnV0TgptgTqBMlbLYwaisnIS3Z/ZH5ziJXQ==
 
+[init]
+    defaultBranch = main
+
 [alias]
     dc = diff --staged
     di = diff
@@ -41,18 +45,31 @@
 [push]
     default = current
 
+[merge]
+    conflictstyle = diff3
+
+[diff]
+    colorMoved = default
+
+[interactive]
+    pager = delta --color-only
+
 [github]
     user = maxbucknell
+
+[delta]
+    navigate = true
+    line-numbers = true
+    syntax-theme = ansi
+
 [credential]
     helper = osxkeychain
+
 [filter "lfs"]
     clean = git-lfs clean -- %f
     smudge = git-lfs smudge -- %f
     process = git-lfs filter-process
     required = true
-[init]
-    defaultBranch = main
-[user]
 
 [gpg]
     format = ssh

vim/vim.symlink/colors/mpwb.vim

@@ -34,6 +34,7 @@ hi Constant cterm=NONE ctermfg=NONE ctermbg=NONE
 hi Define cterm=NONE ctermfg=NONE ctermbg=NONE
 hi Include cterm=NONE ctermfg=NONE ctermbg=NONE
 hi Macro cterm=NONE ctermfg=NONE ctermbg=NONE
+hi PreProc cterm=NONE ctermfg=NONE ctermbg=NONE
 
 hi VimHiAttrib cterm=NONE ctermfg=NONE ctermbg=NONE
 hi VimOption cterm=NONE ctermfg=NONE ctermbg=NONE

vim/vimrc.symlink

@@ -1,8 +1,30 @@
+" vim: set ft=vim
 set nocompatible
 
 set encoding=utf-8
 scriptencoding utf-8
 
+" Plugins
+
+call plug#begin()
+
+Plug 'tpope/vim-commentary'
+Plug 'tpope/vim-fugitive'
+Plug 'tpope/vim-surround'
+
+Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
+Plug 'junegunn/fzf.vim'
+
+Plug 'jayli/vim-easycomplete'
+Plug 'SirVer/ultisnips'
+
+call plug#end()
+
+" Plugin configuration
+
+" Get AI out of here
+let g:easycomplete_tabnine_enable = 0
+
 " Syntax and colors and things
 filetype plugin indent on
 syntax on
@@ -55,7 +77,6 @@ set scrolloff=5
 " I think left to write, top to bottom
 set splitright splitbelow
 
-
 " Basic whitespace
 set nojoinspaces
 set expandtab
@@ -85,7 +106,6 @@ nnoremap <leader><leader> <c-^>
 
 " Fix shift-semicolon to write
 noremap ; :
-noremap ;; ;
 
 " I should map these to something useful
 inoremap <up> <nop>
@@ -125,7 +145,7 @@ nnoremap <c-l> <c-w><c-l>
 
 " Focus mode
 
-function Zoom()
+function! Zoom()
     if exists('g:is_zoomed')
         unlet g:is_zoomed
         execute "wincmd ="
@@ -178,5 +198,7 @@ function! <SID>SynStack()
   echo map(synstack(line('.'), col('.')), 'synIDattr(v:val,"name")')
 endfunc
 
+" Open syntax file for current
+
 " Syntax highlighting
 colorscheme mpwb

zsh/zshrc.symlink

@@ -3,10 +3,6 @@ source /etc/zshrc
 # Secret stuff
 source $HOME/.zsh/secret
 
-# Fuzzy finder!
-source $HOME/.zsh/fzf.zsh
-export FZF_DEFAULT_COMMAND='rg --files --hidden --follow --glob "!.git/*"'
-
 ## Path
 # Default path
 export PATH="/sbin"
@@ -27,9 +23,10 @@ export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}"
 
 PATH="/opt/homebrew/bin:/opt/homebrew/sbin:$PATH}"
 
-# Composer (PHP)
+# Fuzzy finder!
-PATH="$HOME/.composer/vendor/bin:$PATH"
+source "$(brew --prefix fzf)/shell/key-bindings.zsh"
-export COMPOSER_HOME="$HOME/.composer"
+source "$(brew --prefix fzf)/shell/completion.zsh"
+export FZF_DEFAULT_COMMAND='rg --files --hidden --follow --glob "!.git/*"'
 
 # Python
 export PYTHONPATH="$PYTHONPATH:$HOME/dotfiles/lib/python"
@@ -37,31 +34,19 @@ export PYTHONPATH="$PYTHONPATH:$HOME/dotfiles/lib/python"
 # Rust
 source $HOME/.cargo/env
 
-# Ruby (2.7)
+# Ruby
-export PATH="/opt/homebrew/lib/ruby/gems/2.7.0/bin:$PATH"
+export PATH="$(brew --prefix ruby)/bin:$PATH"
 
 # Go
 export GOPATH="$HOME/go"
 export GOBIN="$GOPATH/bin"
 PATH="$GOBIN:$PATH"
 
-# JS stuff
-export PATH="$HOME/.yarn/bin:$HOME/.config/yarn/global/node_modules/.bin:$PATH"
-export PATH="$HOME/.rover/bin:$PATH"
-export PATH="$PATH:/opt/homebrew/Cellar/node@18/18.20.4/bin"
-
-export NPM_PACKAGES="$HOME/.config/npm/node_modules"
-export PATH="$PATH:$NPM_PACKAGES/bin"
-
-
 # Local path
 PATH="$HOME/dotfiles/bin/misc:$PATH"
 PATH="$HOME/dotfiles/bin:$PATH"
 PATH="$HOME/bin:$PATH"
 
-# Playdate!
-export PLAYDATE_SDK_PATH="$HOME/Developer/PlaydateSDK"
-
 # Android
 export ANDROID_HOME="$HOME/Library/Android/sdk"
 export PATH="$ANDROID_HOME/emulator:$ANDROID_HOME/platform-tools:$PATH"
@@ -83,36 +68,6 @@ compinit
 
 source "$HOME/.zsh/_bazel"
 
-## Syntax Highlighting
-source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
-
-# Make errors red
-ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red'
-
-# Turn just about everything else off
-ZSH_HIGHLIGHT_STYLES[reserved-word]='none'
-ZSH_HIGHLIGHT_STYLES[reserved-word]='none'
-ZSH_HIGHLIGHT_STYLES[alias]='none'
-ZSH_HIGHLIGHT_STYLES[builtin]='none'
-ZSH_HIGHLIGHT_STYLES[function]='none'
-ZSH_HIGHLIGHT_STYLES[command]='none'
-ZSH_HIGHLIGHT_STYLES[precommand]='none'
-ZSH_HIGHLIGHT_STYLES[commandseparator]='none'
-ZSH_HIGHLIGHT_STYLES[hashed-command]='none'
-ZSH_HIGHLIGHT_STYLES[path]='none'
-ZSH_HIGHLIGHT_STYLES[path_prefix]='none'
-ZSH_HIGHLIGHT_STYLES[path_approx]='none'
-ZSH_HIGHLIGHT_STYLES[globbing]='none'
-ZSH_HIGHLIGHT_STYLES[history-expansion]='none'
-ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='none'
-ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='none'
-ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='none'
-ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='none'
-ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='none'
-ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='none'
-ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='none'
-ZSH_HIGHLIGHT_STYLES[assign]='none'
-ZSH_HIGHLIGHT_STYLES[default]='none'
 
 # Get the first part of the hostname
 #
@@ -200,9 +155,13 @@ source /opt/homebrew/share/liquidprompt
 alias vi=vim
 alias v=vim
 
-# Bazel -__-
+# Bazel
 alias bazel='bazelisk'
 
+# Prefer bat (maybe?)
+alias cat='bat --paging="never"'
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+
 # Use fzf to select a running tmux session to attach to
 function select_session_interactive {
     tmux list-sessions 2> /dev/null |
@@ -252,3 +211,35 @@ esac
 # pnpm end
 
 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"
+
+## Syntax Highlighting
+source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+
+# Make errors red
+ZSH_HIGHLIGHT_STYLES[unknown-token]='fg=red'
+
+# Turn just about everything else off
+ZSH_HIGHLIGHT_STYLES[alias]='none'
+ZSH_HIGHLIGHT_STYLES[assign]='none'
+ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]='none'
+ZSH_HIGHLIGHT_STYLES[back-quoted-argument]='none'
+ZSH_HIGHLIGHT_STYLES[builtin]='none'
+ZSH_HIGHLIGHT_STYLES[command]='none'
+ZSH_HIGHLIGHT_STYLES[commandseparator]='none'
+ZSH_HIGHLIGHT_STYLES[default]='none'
+ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]='none'
+ZSH_HIGHLIGHT_STYLES[double-hyphen-option]='none'
+ZSH_HIGHLIGHT_STYLES[double-quoted-argument]='none'
+ZSH_HIGHLIGHT_STYLES[function]='none'
+ZSH_HIGHLIGHT_STYLES[globbing]='none'
+ZSH_HIGHLIGHT_STYLES[hashed-command]='none'
+ZSH_HIGHLIGHT_STYLES[history-expansion]='none'
+ZSH_HIGHLIGHT_STYLES[path]='none'
+ZSH_HIGHLIGHT_STYLES[path_approx]='none'
+ZSH_HIGHLIGHT_STYLES[path_prefix]='none'
+ZSH_HIGHLIGHT_STYLES[precommand]='none'
+ZSH_HIGHLIGHT_STYLES[redirection]='none'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='none'
+ZSH_HIGHLIGHT_STYLES[reserved-word]='none'
+ZSH_HIGHLIGHT_STYLES[single-hyphen-option]='none'
+ZSH_HIGHLIGHT_STYLES[single-quoted-argument]='none'