.gitignore

@@ -6,3 +6,4 @@ vim/tmp/*
 .notebook
 vim/init.vim
 .notebook
+aws

bashrc

@@ -79,3 +79,8 @@ export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export PATH="/usr/local/opt/coreutils/libexec/gnubin:$PATH"
 export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
+source "$HOME/.cargo/env"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion

bin/manage_dotfiles.sh

@@ -64,6 +64,9 @@ install_dotfiles() {
     link "$HOME" "$conf"
   done
 
+  ln -fsn "$PWD/vim" "$HOME/.config/nvim"
+  ln -fsn "$PWD/vimrc" "$HOME/.config/init.vim"
+
   # Finish up linking and directory stuff
   ln -fsn "$DIR"/vim/pathogen/autoload "$DIR"/vim/
   mkdir -p "$DIR"/vim/tmp/{backup,swap,undo,view}
@@ -71,25 +74,27 @@ install_dotfiles() {
 
 update_git_submodules() {
   git submodule update --init --recursive
-  git submodule foreach --recursive git reset --hard origin/master
-  git submodule foreach --recursive git pull origin master
-  git submodule foreach git submodule update --init --recursive
+
+  # vim/bundle/YouCompleteMe/third_party/ycmd/third_party/mrab-regex doesn't
+  # have a main/master branch, so include "hg"
+  #
+  # git fetch -a && \
+  # git checkout -b rm_detached_head && \
+  # (git checkout master || git checkout main || git checkout hg) && \
+  # git branch -D rm_detached_head && \
+  # (git reset --hard remotes/origin/master || git reset --hard remotes/origin/main || git reset --hard remotes/origin/hg)
+  git submodule foreach --recursive zsh -c 'git fetch -a && git checkout -b rm_detached_head && (git checkout master || git checkout main || git checkout hg) && git branch -D rm_detached_head && (git reset --hard remotes/origin/master || git reset --hard remotes/origin/main || git reset --hard remotes/origin/hg)'
 }
 
 compile_ycm() {
   echo "Compiling YouCompleteMe"
   cd "$DIR"/vim/bundle/YouCompleteMe
-  ./install.py --ts-completer --clang-completer --clangd-completer --cs-completer --rust-completer --java-completer
+  ./install.py --ts-completer --clang-completer --clangd-completer --cs-completer --rust-completer
   cd "$DIR"
 }
 
 compile_exctags() {
-  git clone git://github.com/jakedouglas/exuberant-ctags.git "$DIR"/exuberant-ctags
-  cd "$DIR"/exuberant-ctags
-  ./configure
-  make
-  sudo make install
-  rm -rf "$DIR"/exuberant-ctags
+  brew install --HEAD universal-ctags/universal-ctags/universal-ctags
 }
 
 case "$1" in

gitconfig

@@ -1,6 +1,7 @@
 [user]
   email = andrew@andrewswistak.com
   name = Andrew Swistak
+	signingkey = 666C20960EF30DE21A0C9866C3F4D60CA6D49CA0
 [push]
   default = simple
 [merge]
@@ -44,3 +45,5 @@
   insteadOf = github.com
 [init]
   templatedir = ~/.git_template
+[diff "rails_credentials"]
+	textconv = bin/rails credentials:diff

gitignore

@@ -0,0 +1,31 @@
+project.vim
+jsconfig.json
+
+
+# General
+.DS_Store
+.AppleDouble
+.LSOverride
+
+# Icon must end with two \r
+Icon
+
+
+# Thumbnails
+._*
+
+# Files that might appear in the root of a volume
+.DocumentRevisions-V100
+.fseventsd
+.Spotlight-V100
+.TemporaryItems
+.Trashes
+.VolumeIcon.icns
+.com.apple.timemachine.donotpresent
+
+# Directories potentially created on remote AFP share
+.AppleDB
+.AppleDesktop
+Network Trash Folder
+Temporary Items
+.apdisk

tmux.conf

@@ -18,3 +18,9 @@ setw -g mouse on
 set-option -ga terminal-overrides ",xterm-256color:Tc"
 set -g default-terminal "screen-256color"
 
+set-option -g focus-events on
+
+set-window-option -g mode-keys vi
+bind-key -T copy-mode-vi v send -X begin-selection
+bind-key -T copy-mode-vi y send-keys -X copy-pipe-and-cancel "pbcopy"
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "pbcopy"

vim/bundle/YouCompleteMe

@@ -1 +1 @@
-Subproject commit 94cfacd11ff97643a32409671fed072e3b1412d6
+Subproject commit 99ccab251fad7c8b235582b46752a0536d01b315

vim/bundle/ale

@@ -1 +1 @@
-Subproject commit dfe9b7cc2650c03127c5f897767bcb85bc0bad1f
+Subproject commit e4b20544082ba019d8095cbc24ffab43b15e8fc0

vim/bundle/delimitMate

@@ -1 +1 @@
-Subproject commit 728b57a6564c1d2bdfb9b9e0f2f8c5ba3d7e0c5c
+Subproject commit 537a1da0fa5eeb88640425c37e545af933c56e1b

vim/bundle/gotests-vim

@@ -1 +1 @@
-Subproject commit e0ad687be26875153ecd43d16db3b93a637394e4
+Subproject commit 42abccb59e9889cd1ce427b11b2ffbb36f2a46a6

vim/bundle/mustache

@@ -1 +1 @@
-Subproject commit 697fa0277042a028d1731d36397c42d9f182a785
+Subproject commit 0153fe03a919add2d6cf2d41b2d5b6e1188bc0e0

vim/bundle/nerdcommenter

@@ -1 +1 @@
-Subproject commit 92082862364cf5ec3eec79a025bbc7bc5165e05f
+Subproject commit fe74a1b890701eb5f196e9639b2147d5f126d9ae

vim/bundle/nerdtree

@@ -1 +1 @@
-Subproject commit 371feb7e540afc1d25c3369d4157358d21f51681
+Subproject commit fc85a6f07c2cd694be93496ffad75be126240068

vim/bundle/omnisharp-vim

@@ -1 +1 @@
-Subproject commit bc8ce839cb8365df852aad1682f254adf25d6846
+Subproject commit c065733980428672e1aa7dbb3dd21c9b54bd9460

vim/bundle/rust.vim

@@ -1 +1 @@
-Subproject commit 8293adcd9c5645379133bea4d77de30b1476528c
+Subproject commit 1cdc5cb4bd061bc30b502e07321682b5a4396dca

vim/bundle/supertab

@@ -1 +1 @@
-Subproject commit 40fe711e088e2ab346738233dd5adbb1be355172
+Subproject commit f0093ae12a9115498f887199809a6114659fc858

vim/bundle/ultisnips

@@ -1 +1 @@
-Subproject commit 83e421c7573c774d35d9193b882641deb8269274
+Subproject commit e99fdf15cd55a4a8e0cb0a80a6810c1867a5c401

vim/bundle/vim-airline

@@ -1 +1 @@
-Subproject commit 6d665580a3435f21ad560af192d854d4b608fff5
+Subproject commit 0ed7b8bb2ed68d65a5ba55317896680b31d315b0

vim/bundle/vim-airline-themes

@@ -1 +1 @@
-Subproject commit 0d5c5c1e2995126e76606a628316c8e3f5efb37a
+Subproject commit cc5d3490c8f4c87d29d97df414941a9df8ceb390

vim/bundle/vim-bundler

@@ -1 +1 @@
-Subproject commit c4553a999c77e48bf74f43ac3d3503456bbba5a5
+Subproject commit f8f0bdf6856ccc19025f67800cccff0bea05d6b1

vim/bundle/vim-coffee-script

@@ -1 +1 @@
-Subproject commit 9e3b4de2a476caeb6ff21b5da20966d7c67a98bb
+Subproject commit 28421258a8dde5a50deafbfc19cd9873cacfaa79

vim/bundle/vim-cucumber

@@ -1 +1 @@
-Subproject commit bcb119cf9a6e131d5c9cbb7af3296eb6f2c23151
+Subproject commit 178d6a8b5545dfff28aeb051bbef471839c0e106

vim/bundle/vim-dispatch

@@ -1 +1 @@
-Subproject commit 4bd1ecd7f38206ef26c37d7d142df58c4237d9dc
+Subproject commit 00e77d90452e3c710014b26dc61ea919bc895e92

vim/bundle/vim-endwise

@@ -1 +1 @@
-Subproject commit 9b04cdca8c1ae4ac5a0874b934af94d033102247
+Subproject commit 4e5c8358d751625bb040b187b9fe430c2b769f0a

vim/bundle/vim-fanfingtastic

@@ -1 +1 @@
-Subproject commit f6674e44840172dee5eb7e74be021ccf8403a72b
+Subproject commit 6d0fea6dafbf3383dbab1463dbfb3b3d1b94b209

vim/bundle/vim-fugitive

@@ -1 +1 @@
-Subproject commit 06e34204af04643d96d30132de6ba9066368de15
+Subproject commit dd8107cabf5fe85df94d5eedcae52415e543f208

vim/bundle/vim-go

@@ -1 +1 @@
-Subproject commit 17c53d38f17b0978323868ac12573f33a6fb8100
+Subproject commit 22b2273cfe562ac1c1af976ce77f18a3b1776f3c

vim/bundle/vim-graphql

@@ -1 +1 @@
-Subproject commit 61e342c4facd5cbc645104262e866882ea1cf5c3
+Subproject commit 4bf5d33bda83117537aa3c117dee5b9b14fc9333

vim/bundle/vim-polyglot

@@ -1 +1 @@
-Subproject commit 31c55b85a03d96252bba14d64911cc78a20369a1
+Subproject commit bc8a81d3592dab86334f27d1d43c080ebf680d42

vim/bundle/vim-prettier

@@ -1 +1 @@
-Subproject commit 427ef6830294c722f04cd3799f2c27a6629976a6
+Subproject commit 5e6cca21e12587c02e32a06bf423519eb1e9f1b2

vim/bundle/vim-rails

@@ -1 +1 @@
-Subproject commit 6e0a002ada9ef098a584e3eb1a8049acae109092
+Subproject commit a6d2bac95b446a5c23eff4638eca164b0d77454a

vim/bundle/vim-repeat

@@ -1 +1 @@
-Subproject commit ae361bea990e27d5beade3a8d9fa22e25cec3100
+Subproject commit 24afe922e6a05891756ecf331f39a1f6743d3d5a

vim/bundle/vim-sayonara

@@ -1 +1 @@
-Subproject commit 357135ce127581fab2c0caf45d4b3fec4603aa77
+Subproject commit 75c73f3cf3e96f8c09db5291970243699aadc02c

vim/bundle/vim-sensible

@@ -1 +1 @@
-Subproject commit 5dc6eb2d8026b4ce812a5a9c966d232b1f50c9c7
+Subproject commit 8985da7669bbd73afce85ef0e4a3e1ce2e488595

vim/bundle/vim-surround

@@ -1 +1 @@
-Subproject commit fab8621670f71637e9960003af28365129b1dfd0
+Subproject commit 3d188ed2113431cf8dac77be61b842acb64433d9

vim/bundle/vim-unimpaired

@@ -1 +1 @@
-Subproject commit ab7082c0e89df594a5ba111e18af17b3377d216d
+Subproject commit efdc6475f7ea789346716dabf9900ac04ee8604a

vim/pathogen

@@ -1 +1 @@
-Subproject commit e9fb0914dba5bdfe2feaa364dda2e9495c5620a2
+Subproject commit ac4dd9494fa9008754e49dff85bff1b5746c89b4

vimrc

@@ -146,6 +146,12 @@ nnoremap <silent> <C-i> :nohlsearch<CR>
 " Formatting
 nmap <silent> =j :FormatJSON<CR>
 nmap <silent> =x :FormatXML<CR>
+"au FileType javascript setlocal formatprg=prettier
+"au FileType javascript.jsx setlocal formatprg=prettier
+"au FileType typescript setlocal formatprg=prettier\ --parser\ typescript
+"au FileType html setlocal formatprg=js-beautify\ --type\ html
+"au FileType scss setlocal formatprg=prettier\ --parser\ css
+"au FileType css setlocal formatprg=prettier\ --parser\ css
 
 nmap <silent> =, :s/$/,/<CR><C-i>
 
@@ -185,7 +191,7 @@ let g:ctrlp_match_window_reversed = 0
 
 " Ignore some filetypes
 let g:ctrlp_custom_ignore = 'node_modules\|DS_Store\|\v\~$|\.(o|swp|pyc|wav|mp3|ogg|blend)$|(^|[/\\])\.(hg|git|bzr)($|[/\\])|__init__\.py'
-"let g:ctrlp_by_filename = 1
+let g:ctrlp_by_filename = 1
 let g:ctrlp_clear_cache_on_exit = 0
 
 " Uncomment to show hidden directories.
@@ -309,7 +315,7 @@ let g:rails_gem_projections = {
       \     }
       \   },
       \   "draper": {
-      \     "app/decorators/*_decorator.rb": {
+      \     "app/decorators/*.rb": {
       \       "command": "decorator",
       \       "affinity": "model",
       \       "alternate": "app/models/{}.rb",
@@ -320,7 +326,7 @@ let g:rails_gem_projections = {
       \     }
       \   },
       \   "graphql": {
-      \     "app/graphql/types/*_type.rb": {
+      \     "app/graphql/types/*.rb": {
       \       "command": "type",
       \       "affinity": "model",
       \       "alternate": "app/models/{}.rb",
@@ -328,7 +334,7 @@ let g:rails_gem_projections = {
       \       "test": "spec/graphql/type/{}_type_spec.rb",
       \       "template": "# frozen_string_literal: true\n\nmodule Types\n  class {camelcase|capitalize|colons}Type < Types::BaseObject\n    graphql_name '{capitalize}'\n  end\nend",
       \     },
-      \     "app/graphql/resolvers/*_resolver.rb": {
+      \     "app/graphql/resolvers/*.rb": {
       \       "command": "resolver",
       \       "affinity": "model",
       \       "alternate": "app/models/{}.rb",
@@ -536,7 +542,7 @@ function! s:MaybeRunProjectSettings(file)
     return
   endif
 
-  let git_dir = fugitive#extract_git_dir(@%)
+  let git_dir = FugitiveExtractGitDir(@%)
   if git_dir != ""
     if filereadable(git_dir.'/project.vim')
       exec "source ".(git_dir.'/project.vim')
@@ -546,8 +552,8 @@ function! s:MaybeRunProjectSettings(file)
 endfunction
 
 if has('nvim')
-  let g:python_host_prog = "/usr/local/bin/python2"
-  let g:python3_host_prog = "/usr/local/bin/python3"
+  let g:python3_host_prog = "/opt/homebrew/bin/python3"
+  let g:loaded_perl_provider = 0 "disable perl
 endif
 
 let g:ycm_key_list_select_completion = ['<C-n>', '<Down>']
@@ -562,16 +568,16 @@ let g:UltiSnipsJumpBackwardTrigger="<c-z>"
 let g:ale_completion_enabled = 0
 let g:airline#extensions#ale#enabled = 1
 let g:ale_linters = {
-      \   'javascript': ['eslint'],
-      \   'ruby': ['rubocop'],
+      \   'ruby': ['standardrb'],
       \}
+"      \   'javascript': ['eslint'],
 
 let g:ale_fixers = {
       \    'javascript': ['eslint', 'prettier'],
       \    'typescript': ['eslint', 'prettier'],
       \    'scss': ['prettier'],
       \    'html': ['prettier'],
-      \    'ruby': ['rubocop'],
+      \    'ruby': ['standardrb'],
       \}
 
 let g:ale_fix_on_save = 1
@@ -581,3 +587,4 @@ let g:ale_lint_delay = 1000
 " Should be able to get by with using javascript{,.jsx} highlighting for now
 au BufRead,BufNewFile *.ts set filetype=javascript
 au BufRead,BufNewFile *.tsx set filetype=javascript.jsx
+au BufRead,BufNewFile *_spec.rb set filetype=rspec

zshrc

@@ -22,8 +22,8 @@ export EDITOR="nvim"
 alias vim="nvim"
 
 # OS X completions
-fpath=(/usr/local/share/zsh-completions $fpath)
-source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+fpath=(/opt/homebrew/share/zsh-completions $fpath)
+source /opt/homebrew/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
 
 dot_sync() {
   current_branch=$(git branch | grep '\*.*' | cut -d '*' -f 2 | tr -d ' ')
@@ -52,6 +52,7 @@ bindkey '^[OF' end-of-line
 bindkey '^[[3~' delete-char
 bindkey '^[[5~' beginning-of-buffer-or-history
 bindkey '^[[6~' end-of-buffer-or-history
+bindkey '^R' history-incremental-search-backward
 
 export PAGER=less
 export DOTFILES=$HOME/Documents/dotfiles
@@ -63,9 +64,6 @@ export RUST_SRC_PATH=$(rustc --print sysroot)/lib/rustlib/src/rust/src
 
 alias ack=ag
 
-# added by travis gem
-[ -f $HOME/.travis/travis.sh ] && source $HOME/.travis/travis.sh
-
 export DOTNET_CLI_TELEMETRY_OPTOUT=1
 export PATH="/usr/local/opt/icu4c/bin:$PATH"
 export PATH="/usr/local/opt/icu4c/sbin:$PATH"
@@ -75,9 +73,7 @@ export MANPATH="/usr/local/opt/coreutils/libexec/gnuman:$MANPATH"
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm"
 
 plugins=(
-  aws
   bundler
-  cargo
   docker
   docker-compose
   git
@@ -86,8 +82,13 @@ plugins=(
   rails
   rake
   ruby
-  rust
-  rvm
   rvm
   yarn
 )
+
+eval "$(/opt/homebrew/bin/brew shellenv)"
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+export GPG_TTY=$(tty)