From f4d6699588da0ea6688ddcbfa3cfce665b8b5c6c Mon Sep 17 00:00:00 2001
From: Andrew Tomaka <atomaka@gmail.com>
Date: Tue, 2 Nov 2021 09:48:51 -0400
Subject: [PATCH] Ship it xD

---
 git/.gitconfig |  2 ++
 vim/.vimrc     | 11 ++++++-----
 zsh/.aliases   |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/git/.gitconfig b/git/.gitconfig
index 21d1951..b8f4106 100644
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -53,3 +53,5 @@
   cachetextconv = false
 [pull]
 	ff = only
+[init]
+	defaultBranch = master
diff --git a/vim/.vimrc b/vim/.vimrc
index 76029b2..a8f7f76 100644
--- a/vim/.vimrc
+++ b/vim/.vimrc
@@ -7,7 +7,6 @@ Plug 'joshdick/onedark.vim'
 
 " keepers
 Plug 'airblade/vim-gitgutter'
-Plug 'hashivim/vim-terraform'
 Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 Plug 'ntpeters/vim-better-whitespace'
@@ -26,11 +25,10 @@ Plug 'posva/vim-vue'
 Plug 'tpope/vim-markdown'
 Plug 'tpope/vim-rails'
 Plug 'vim-ruby/vim-ruby'
+Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
+Plug 'hashivim/vim-terraform'
 
 " Testing
-Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
-" Plug 'dense-analysis/ale'
-" Plug 'w0rp/ale'
 
 call plug#end()
 filetype plugin indent on
@@ -40,7 +38,7 @@ set statusline=
 set statusline+=%<\ %f%{ZoomState()}
 set statusline+=\ %m%r%y%w%=            " what am i doing here
 set statusline+=\ Line:\ %l\/%L\ [%p%%]
-set statusline+=\ Col:\ %c
+set statusline+=\ Col:\ %v
 set statusline+=\ Buf:\ #%n
 set statusline+=\                       " trailing space is with purpose
 
@@ -149,6 +147,8 @@ map <Leader>cs :let @/ = ""<cr>
 nnoremap <silent> <Leader>bd :Bdelete<CR>
 
 " other
+map <Leader>cp "+y
+map <Leader>pa "+p
 map <Leader>fj :%!python -m json.tool<cr>
 map <Leader>fw :StripWhitespace<cr>
 map <Leader>gg :exe "!hub gist create -o %:p"<cr><cr>
@@ -179,6 +179,7 @@ highlight ExtraWhitespace ctermbg=196
 
 " fzf
 let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -g ""'
+let g:fzf_preview_window = []
 
 " terraform
 let g:terraform_align=1
diff --git a/zsh/.aliases b/zsh/.aliases
index 864a0c4..3d73ef1 100644
--- a/zsh/.aliases
+++ b/zsh/.aliases
@@ -13,7 +13,7 @@ alias ber="bundle exec rake"
 alias bet="test-rails"
 alias betd="bundle exec rspec --format documentation"
 alias c="clear"
-alias dc="docker-compose"
+alias dc="docker compose"
 alias dft="docker run --rm --privileged alpine hwclock -s"
 alias g="g" # overwrite g alias in git plugin so function will work
 alias ga="git add"
@@ -26,6 +26,7 @@ alias gbdm='git branch --merged | grep -v "\*" | grep -v master | grep -v dev |
 alias gc="git commit"
 alias gca="git commit --amend"
 alias gcm="echo Do not specify message at command line.  Use gc"
+alias gcn="git commit --allow-empty --message 'noop'"
 alias gco="git checkout"
 alias gcp="git cherry-pick"
 alias gcs="git commit -m '¯\_(ツ)_/¯'"