Install: Move devcontainer to be installed with npm

Having brew install node will conflict with the nvm installed version of
node. It can behave in weird ways, including having different versions
of node take priority whether in tmux or not.

.bashrc

@@ -10,10 +10,6 @@ alias dedsstore="find . -name \".DS_Store\" -delete"
 alias c="clear"
 alias dps="docker ps -a --format 'table {{.Names}}\t{{.Status}}\t{{.Image}}'"
 
-# Difftastic Config
-export DFT_TAB_WIDTH=4
-export DFT_BACKGROUND=light
-
 # History
 HISTSIZE=50000
 HISTFILESIZE=50000
@@ -57,12 +53,15 @@ fi
 alias tmux="tmux -2"
 alias grep="grep --color=auto"
 
+eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
+
 # Fix gpg signing
 # https://github.com/keybase/keybase-issues/issues/2798
 export GPG_TTY=$(tty)
 
 # Golang
-export PATH=$PATH:/usr/local/go/bin:${HOME}/go/bin
+# NOTE: Go is installed with Homebrew and automatically placed on the path
+export PATH=$PATH:${HOME}/go/bin
 
 export TERM="xterm-256color"
 export EDITOR=$(which vim)
@@ -76,22 +75,7 @@ if [[ -d ${HOME}/bin ]]; then
 fi
 
 # fzf
-# TODO: Why are these files in so many different places?
-if [ -f ~/.fzf.bash ]; then
-    source ~/.fzf.bash
-fi
-
-if [ -f /usr/share/bash-completion/completions/fzf ]; then
-    source /usr/share/bash-completion/completions/fzf
-fi
-
-if [ -f /usr/share/doc/fzf/examples/key-bindings.bash ]; then
-    source /usr/share/doc/fzf/examples/key-bindings.bash
-fi
-
-if [ -f /usr/share/doc/fzf/examples/completion.bash ]; then
-    source /usr/share/doc/fzf/examples/completion.bash
-fi
+eval "$(fzf --bash)"
 
 export FZF_DEFAULT_OPTS=" \
 --color=bg+:#ccd0da,bg:#eff1f5,spinner:#dc8a78,hl:#d20f39 \
@@ -124,15 +108,6 @@ _git_top() {
     fi
 }
 
-function up() {
-    num=1
-    if [ $# -gt 0 ]; then
-        num=$1
-    fi
-
-    cd $(printf '../%.0s' $(seq 1 $num))
-}
-
 # Add color shortcuts
 if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
   c_reset=`tput sgr0`

bin/linux/bat

@@ -1 +0,0 @@
-bat-0.24.0

bin/linux/delta

@@ -1 +0,0 @@
-delta-0.15.1

bin/linux/difft

@@ -1 +0,0 @@
-difft-0.38.0

bin/linux/dive

@@ -1 +0,0 @@
-dive-0.10.0

bin/linux/eza

@@ -1 +0,0 @@
-eza-0.11.0

bin/linux/fd

@@ -1 +0,0 @@
-fd-v10.1.0

bin/linux/gron

@@ -1 +0,0 @@
-gron-0.7.1

bin/linux/jq

@@ -1 +0,0 @@
-jq-1.7

bin/linux/lazygit

@@ -1 +0,0 @@
-lazygit-0.42.0

install.sh

@@ -77,12 +77,29 @@ function performSetup() {
     echo "Linking neovim config"
     ln -fns ${DOTFILES_DIR}/nvim ~/.config/nvim
 
+    echo "Installing homebrew"
+    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+
     if [[ "${OSTYPE}" == "darwin"* ]]; then
-        brew install rsync rga pandoc poppler tesseract tmux ledger 
+        brew install tmux
     else
-        sudo apt install visidata ripgrep
+        sudo apt install build-essential visidata
     fi
 
+    # NOTE: Do not brew install anything with a dependency on node.
+    # Instead, install with npm -g.
+
+    brew install \
+        gcc \
+        tmux neovim \
+        eza bat fzf ripgrep fd jq gron \
+        git lazygit git-delta \
+        crane dive \
+        go sqlite \
+        stripe-cli restic
+
+    npm install -g @devcontainers/cli
+
     popd > /dev/null
 }
 

nvim/init.lua

@@ -177,6 +177,12 @@ vim.api.nvim_create_autocmd('TextYankPost', {
   end,
 })
 
+-- Trim trailing whitespace on save.
+vim.api.nvim_create_autocmd({ 'BufWritePre' }, {
+  pattern = { '*' },
+  command = [[%s/\s\+$//e]],
+})
+
 -- [[ Install `lazy.nvim` plugin manager ]]
 --    See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info
 local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'