From e8b6323177e64f1cfb4636340e7ba9649ac0c7e1 Mon Sep 17 00:00:00 2001
From: Joe Papperello <joe@socialflow.com>
Date: Tue, 12 Jun 2018 07:35:51 -0400
Subject: [PATCH] merge

---
 bashrc     | 17 ++++++++++++-----
 install.sh |  1 -
 vimrc      | 15 +++++++++++----
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/bashrc b/bashrc
index 491b067..1d46448 100644
--- a/bashrc
+++ b/bashrc
@@ -32,11 +32,7 @@ ec2-info() {
 }
 export EDITOR=vim
 export GOPATH=$HOME/code/go
-<<<<<<< Updated upstream
-export PATH=$HOME/Library/Python/2.7/bin:$HOME/bin:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$PATH 
-=======
-export PATH=$HOME/bin:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$PATH 
->>>>>>> Stashed changes
+export PATH=$HOME/bin:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:$HOME/Library/Python/2.7/bin:$PATH 
 [ -f $HOME/perl5/lib/perl5/Devel/Local.pm ] && source `which devel-local.sh`
 function github() {
     git clone git@github.com:SocialFlowDev/$1.git
@@ -63,7 +59,11 @@ export PYTHONPATH=~/python/
 
 
 alias sfreversion='perl-reversion --bump lib/SocialFlow/Web.pm;git add lib/SocialFlow/Web.pm;git commit -m "Bumping sf-web version"'
+<<<<<<< Updated upstream
 alias sfcpanm='cpanm --mirror http://cpan-mirror.dev.saturn.sfsrv.net:25123 --mirror-only' 
+=======
+#alias sfcpanm='cpanm --mirror file:///srv/socialflow/mcpan/ --mirror-only'
+>>>>>>> Stashed changes
 alias bump='perl-reversion --bump '
 alias vi='vim -p'
 alias lessr='less -R'
@@ -79,7 +79,14 @@ fi
 export GOPATH=$HOME/code/go
 export PATH=$PATH:$GOPATH/bin
 export PERLBREW_ROOT=$HOME/perlbrew
+<<<<<<< Updated upstream
 
+=======
+#export DOCKER_HOST=tcp://192.168.99.100:2376
+#export DOCKER_CERT_PATH=/Users/joseph/.docker/machine/machines/dev
+#export DOCKER_TLS_VERIFY=1
+#
+>>>>>>> Stashed changes
 function refresh_gpga() {
     if [ -f "${HOME}/.gpg-agent-info" ]; then
         . "${HOME}/.gpg-agent-info"
diff --git a/install.sh b/install.sh
index 18b22b5..d8d4469 100755
--- a/install.sh
+++ b/install.sh
@@ -10,7 +10,6 @@ DIR="$(pwd)"
     mkdir -p "$HOME/.vim/colors"
     mkdir -p "$HOME/.vim/plugin"
     mkdir -p "$HOME/.vim/autoload"
-    mkdir -p "$HOME/.vim/bundle"
     mkdir -p "$HOME/.ssh"
 	ln -sf "$DIR/ssh-config" "$HOME/.ssh/config"
     ln -sf "$DIR/vim-colors/molokaimod.vim" "$HOME/.vim/colors/molokaimod.vim"
diff --git a/vimrc b/vimrc
index 978320c..9b8fa8c 100644
--- a/vimrc
+++ b/vimrc
@@ -150,6 +150,7 @@ nnoremap \ ;
 nnoremap ; :
 nnoremap 0 ^
 nnoremap <Leader>r :Rack 
+autocmd FileType go setlocal omnifunc=go#complete#Complete
 
 " w!! will save file with sudo
 cabbrev w!! w !sudo tee % >/dev/null
@@ -197,9 +198,9 @@ set matchpairs+=<:>
 " omni complete pops up annoying preview window
 set completeopt-=preview
 "au FileType go let g:SuperTabDefaultCompletionType = "context"
-let g:SuperTabDefaultCompletionType = 'context'
+let g:SuperTabDefaultCompletionType = "context"
 autocmd FileType javascript let g:SuperTabDefaultCompletionType= '<c-p>'
-autocmd FileType go,perl
+autocmd FileType *
     \ if &omnifunc != '' |
     \   call SuperTabChain(&omnifunc, "<c-n>") |
     \ endif
@@ -223,7 +224,7 @@ au FileType go nmap <leader>b <Plug>(go-build)
 map <C-n> :lne<CR>
 map <C-m> :lp<CR>
 "let g:go_auto_type_info = 1
-"let g:go_fmt_autosave = 0
+"set updatetime=100
 au FileType go iabbrev _brdoes r *http.Request, results *validation.ValidatedResults) error {<CR>
 au FileType go iabbrev _brhandler w http.ResponseWriter, r *http.Request, results *validation.ValidatedResults) (*api.Return, error) {<CR>
 
@@ -246,7 +247,9 @@ let g:syntastic_html_tidy_ignore_errors = [ 'is not recognized', 'proprietary at
 
 
 " Reccommendation of when using syntastic with vimgo to prevent lag
-"let g:syntastic_go_checkers = ['golint', 'govet', 'errcheck']
+let g:syntastic_go_checkers = ['go', 'golint', 'govet', 'errcheck']
+let g:syntastic_quiet_messages = { "regex": 'should have comment\|comment on' }
+
 let g:syntastic_mode_map = { 'mode': 'active', 'passive_filetypes': ['html', 'perl'] }
 
 "" }}}
@@ -269,5 +272,9 @@ function! Rack(args)
     execute 'Ack ' . a:args  .' ' . l:gitDir
 endfunction
 command! -bang -nargs=* -complete=file Rack call Rack(<q-args>)
+let g:go_highlight_types = 1
+let g:go_highlight_functions = 1
+let g:go_highlight_methods = 1
+
 
 " vim: set fdm=marker: