From cef28bb0e2f3904351b753337e54f0362d6d0f05 Mon Sep 17 00:00:00 2001
From: Mike Cugini <cugini@dropbox.com>
Date: Wed, 4 Jan 2017 14:58:06 -0500
Subject: [PATCH] updated dotfiles

---
 Xresources |  2 +-
 i3/config  | 14 +++++++++++++-
 tmux.conf  |  2 +-
 vimrc      | 50 +++++++++++++++++++++++++++++++++++++++-----------
 zshrc      |  5 ++---
 5 files changed, 56 insertions(+), 17 deletions(-)

diff --git a/Xresources b/Xresources
index 76ed9b1..f19d0c2 100644
--- a/Xresources
+++ b/Xresources
@@ -53,4 +53,4 @@ URxvt.color14: #899ca1
 
 !white
 URxvt.color7:  #ccccc6
-URxvt.color15: #f8f8f2aa
+URxvt.color15: #f8f8f2
diff --git a/i3/config b/i3/config
index a059094..99de604 100644
--- a/i3/config
+++ b/i3/config
@@ -24,7 +24,8 @@ font pango:M+ 1m, FontAwesome, Monotype Noto Sans 8
 floating_modifier $mod
 
 # start a terminal
-bindsym $mod+Return exec i3-sensible-terminal
+#bindsym $mod+Return exec i3-sensible-terminal
+bindsym $mod+Return exec st
 
 # kill focused window
 bindsym $mod+Shift+q kill
@@ -114,6 +115,17 @@ bindsym $mod+Shift+0 move container to workspace 10
 bindsym $mod+Control+Left workspace prev
 bindsym $mod+Control+Right workspace next
 
+bindsym $mod+Control+h move workspace to output left
+bindsym $mod+Control+l move workspace to output right
+
+# scratchpad setup
+
+# make current window a scratchpad
+bindsym $mod+Shift+minus move scratchpad
+
+# show the first scratchpad window
+bindsym $mod+minus scratchpad show
+
 # reload the configuration file
 bindsym $mod+Shift+c reload
 # restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
diff --git a/tmux.conf b/tmux.conf
index 18fa231..a7422ac 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -5,7 +5,7 @@ set -g default-terminal "screen-256color"
 set -g history-limit 10000
 
 # utf8 support
-set-window-option -g utf8 on
+#set-window-option -g utf8 on
 
 # set vim keybindings
 setw -g mode-keys vi
diff --git a/vimrc b/vimrc
index 96279f4..2eed5b6 100644
--- a/vimrc
+++ b/vimrc
@@ -8,28 +8,54 @@ set encoding=utf-8
 set showcmd
 
 set background=dark
-colorscheme molokai
+set termguicolors
+colorscheme molokai "gruvbox zenburn
 let g:molokai_original = 1
 
 "always show status bar
 set laststatus=2
 
-"Go specific settings
-set rtp+=$GOROOT/misc/vim
-au BufRead,BufNewFile *.go set list noexpandtab syntax=go listchars=tab:\|\ ,trail:- 
-set completeopt-=preview
-
 set number
 syntax enable
 filetype plugin on
 filetype plugin indent on
 
-"work
-autocmd BufRead,BufNewFile *sr?/server/*.py set colorcolumn=100
-autocmd BufRead,BufNewFile *src/client/*.py set colorcolumn=120
+"Go specific settings
+set rtp+=$GOROOT/misc/vim
+au BufRead,BufNewFile *.go set list noexpandtab syntax=go listchars=tab:\|\ ,trail:-
+set completeopt-=preview
+
+function! InsertTabWrapper()
+  if pumvisible()
+    return "\<c-n>"
+  endif
+  let col = col('.') - 1
+  if !col || getline('.')[col - 1] !~ '\k'
+    return "\<tab>"
+  else
+    return "\<c-x>\<c-o>"
+  endif
+endfunction
+inoremap <expr><tab> InsertTabWrapper()
+inoremap <expr><s-tab> pumvisible()?"\<c-p>":"\<c-d>"
+
+let g:deoplete#enable_at_startup = 1
+
+let g:syntastic_go_checkers = ['go', 'goimports', 'govet', 'golint']
+let g:deoplete#sources#go#gocode_binary = '~/bin/gocode'
+let g:deoplete#sources#go#use_cache = 1
+let g:deoplete#sources#go#json_directory = '~/.cache/deoplete/go/$GOOS_$GOARCH'
+
+let g:go_fmt_command = "goimports"
+let g:go_highlight_functions = 1
+let g:go_highlight_methods = 1
+let g:go_highlight_fields = 1
+let g:go_highlight_structs = 1
+let g:go_highlight_interfaces = 1
+let g:go_highlight_operators = 1
+let g:go_highlight_build_constraints = 1
 
-"enable mouse
-"set mouse=a
+source ~/.vim/work_customizations.vim
 
 "indent and tab
 set nowrap
@@ -56,6 +82,8 @@ set pastetoggle=<F3>
 
 "configure tagbar
 nmap <F8> :TagbarToggle<CR>
+let g:tagbar_width = 60
+let g:tagbar_sort = 0
 
 let g:tagbar_type_scala = {
     \ 'ctagstype' : 'Scala',
diff --git a/zshrc b/zshrc
index 9dc358d..e3ba01d 100644
--- a/zshrc
+++ b/zshrc
@@ -9,7 +9,7 @@ ZSH=$HOME/.oh-my-zsh
 # DISABLE_AUTO_UPDATE="true"
 
 # Plugins to load
-plugins=(git go knife osx zsh-syntax-highlighting)
+plugins=(git go osx zsh-syntax-highlighting)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -35,8 +35,7 @@ PROMPT='
 %F{red}%n@%m%F{red} %F{green}%/%F{yellow}${vcs_info_msg_0_}%f
 > '
 
-export EDITOR=vim
-export TERM=rxvt-256color
+export EDITOR=nvim
 
 alias ls='ls -G --color'
 alias ll='ls -l'