Ship it xD

This commit is contained in:
Andrew Tomaka 2021-11-02 09:48:51 -04:00
parent 1778b4d836
commit f4d6699588
Signed by: atomaka
GPG key ID: 61209BF70A5B18BE
3 changed files with 10 additions and 6 deletions

View file

@ -53,3 +53,5 @@
cachetextconv = false cachetextconv = false
[pull] [pull]
ff = only ff = only
[init]
defaultBranch = master

View file

@ -7,7 +7,6 @@ Plug 'joshdick/onedark.vim'
" keepers " keepers
Plug 'airblade/vim-gitgutter' Plug 'airblade/vim-gitgutter'
Plug 'hashivim/vim-terraform'
Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' } Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
Plug 'junegunn/fzf.vim' Plug 'junegunn/fzf.vim'
Plug 'ntpeters/vim-better-whitespace' Plug 'ntpeters/vim-better-whitespace'
@ -26,11 +25,10 @@ Plug 'posva/vim-vue'
Plug 'tpope/vim-markdown' Plug 'tpope/vim-markdown'
Plug 'tpope/vim-rails' Plug 'tpope/vim-rails'
Plug 'vim-ruby/vim-ruby' Plug 'vim-ruby/vim-ruby'
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
Plug 'hashivim/vim-terraform'
" Testing " Testing
Plug 'fatih/vim-go', { 'do': ':GoUpdateBinaries' }
" Plug 'dense-analysis/ale'
" Plug 'w0rp/ale'
call plug#end() call plug#end()
filetype plugin indent on filetype plugin indent on
@ -40,7 +38,7 @@ set statusline=
set statusline+=%<\ %f%{ZoomState()} set statusline+=%<\ %f%{ZoomState()}
set statusline+=\ %m%r%y%w%= " what am i doing here set statusline+=\ %m%r%y%w%= " what am i doing here
set statusline+=\ Line:\ %l\/%L\ [%p%%] set statusline+=\ Line:\ %l\/%L\ [%p%%]
set statusline+=\ Col:\ %c set statusline+=\ Col:\ %v
set statusline+=\ Buf:\ #%n set statusline+=\ Buf:\ #%n
set statusline+=\ " trailing space is with purpose set statusline+=\ " trailing space is with purpose
@ -149,6 +147,8 @@ map <Leader>cs :let @/ = ""<cr>
nnoremap <silent> <Leader>bd :Bdelete<CR> nnoremap <silent> <Leader>bd :Bdelete<CR>
" other " other
map <Leader>cp "+y
map <Leader>pa "+p
map <Leader>fj :%!python -m json.tool<cr> map <Leader>fj :%!python -m json.tool<cr>
map <Leader>fw :StripWhitespace<cr> map <Leader>fw :StripWhitespace<cr>
map <Leader>gg :exe "!hub gist create -o %:p"<cr><cr> map <Leader>gg :exe "!hub gist create -o %:p"<cr><cr>
@ -179,6 +179,7 @@ highlight ExtraWhitespace ctermbg=196
" fzf " fzf
let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -g ""' let $FZF_DEFAULT_COMMAND = 'ag --hidden --ignore .git -g ""'
let g:fzf_preview_window = []
" terraform " terraform
let g:terraform_align=1 let g:terraform_align=1

View file

@ -13,7 +13,7 @@ alias ber="bundle exec rake"
alias bet="test-rails" alias bet="test-rails"
alias betd="bundle exec rspec --format documentation" alias betd="bundle exec rspec --format documentation"
alias c="clear" alias c="clear"
alias dc="docker-compose" alias dc="docker compose"
alias dft="docker run --rm --privileged alpine hwclock -s" alias dft="docker run --rm --privileged alpine hwclock -s"
alias g="g" # overwrite g alias in git plugin so function will work alias g="g" # overwrite g alias in git plugin so function will work
alias ga="git add" 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 gc="git commit"
alias gca="git commit --amend" alias gca="git commit --amend"
alias gcm="echo Do not specify message at command line. Use gc" 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 gco="git checkout"
alias gcp="git cherry-pick" alias gcp="git cherry-pick"
alias gcs="git commit -m '¯\_(ツ)_/¯'" alias gcs="git commit -m '¯\_(ツ)_/¯'"