Update configs

.gitmodules

@@ -1,6 +1,6 @@
-[submodule ".vim/bundle/vundle"]
-	path = .vim/bundle/vundle
-	url = https://github.com/gmarik/vundle.git
 [submodule ".oh-my-zsh"]
 	path = .oh-my-zsh
 	url = https://github.com/robbyrussell/oh-my-zsh.git
+[submodule ".tmux/plugins/tpm"]
+	path = .tmux/plugins/tpm
+	url = https://github.com/tmux-plugins/tpm

.profile

@@ -19,7 +19,19 @@ if [ -d "/usr/local/bin" ]; then
     PATH="/usr/local/bin:$PATH"
 fi
 
+#Add Python3.6 local bin to path on OSX
+if [ -d "$HOME/Library/Python/3.6/bin" ] ; then
+  PATH="$HOME/Library/Python/3.6/bin:$PATH"
+fi
+
+#Add Ruby/Gem local bin to path os OSX
+if [ -d "$HOME/.gem/ruby/2.5.0/bin" ] ; then
+  PATH="$HOME/.gem/ruby/2.5.0/bin:$PATH"
+fi
+
 export PATH="$PATH"
 
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
+
+export EDITOR=nvim

.tmux.conf

@@ -1,11 +1,12 @@
-set-option -g prefix C-a
-bind-key C-a last-window
+#set-option -g prefix C-a
+bind-key C-b last-window
 
 set -g base-index 1
 
-set -g status-bg black
-set -g status-fg white
+set -g status-style "fg=#eeeeee,bg=#005f87"
 set -g status-left ""
+set -g mouse on
+set -g escape-time 10
 
 setw -g monitor-activity on
 set -g visual-activity on
@@ -14,8 +15,20 @@ set -g default-terminal "screen-256color"
 
 set-window-option -g window-status-current-bg red
 
+set-option -g history-limit 20000
+
 bind -n S-down new-window
 bind -n S-left prev
 bind -n S-right next
 bind -n C-left swap-window -t -1
 bind -n C-right swap-window -t +1
+
+set-window-option -g mode-keys vi
+bind-key -T copy-mode-vi 'v' send-keys -X begin-selection
+bind-key -T copy-mode-vi 'y' send-keys -X copy-selection
+
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+
+run '~/.tmux/plugins/tpm/tpm'

.vimrc

@@ -1,52 +1,56 @@
 set nocompatible
 filetype off
-set rtp+=~/.vim/bundle/vundle
-call vundle#rc()
+set rtp+=~/.vim/
+call plug#begin('~/.vim/bundle')
 
 " General
-Plugin 'gmarik/vundle'
 if !has('nvim')
-  Plugin 'tpope/vim-sensible'
+  Plug 'tpope/vim-sensible'
 endif
-Plugin 'tpope/vim-surround'
-Plugin 'scrooloose/nerdtree'
-Plugin 'scrooloose/nerdcommenter'
-"Plugin 'scrooloose/syntastic'
-Plugin 'xolox/vim-misc'
-Plugin 'xolox/vim-session'
-Plugin 'vim-airline/vim-airline'
-Plugin 'vim-airline/vim-airline-themes'
-Plugin 'Shougo/denite.nvim'
-Plugin 'vimoutliner/vimoutliner'
-Plugin 'justinmk/vim-sneak'
-Plugin 'junegunn/goyo.vim'
-Plugin 'junegunn/limelight.vim'
+Plug 'tpope/vim-surround'
+Plug 'scrooloose/nerdtree'
+Plug 'scrooloose/nerdcommenter'
+"Plug 'scrooloose/syntastic'
+Plug 'xolox/vim-misc'
+Plug 'xolox/vim-session'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'Shougo/denite.nvim'
+Plug 'vimoutliner/vimoutliner'
+Plug 'justinmk/vim-sneak'
+Plug 'junegunn/goyo.vim'
+Plug 'junegunn/limelight.vim'
 
 " Programming
-Plugin 'SirVer/ultisnips'
-Plugin 'honza/vim-snippets'
-Plugin 'derekwyatt/vim-scala'
-Plugin 'ensime/ensime-vim'
-Plugin 'Shougo/deoplete.nvim'
-Plugin 'Yggdroot/indentLine'
-Plugin 'zchee/deoplete-jedi'
-Plugin 'carlitux/deoplete-ternjs'
+Plug 'SirVer/ultisnips'
+Plug 'honza/vim-snippets'
+Plug 'derekwyatt/vim-scala'
+Plug 'Yggdroot/indentLine'
+Plug 'zchee/deoplete-jedi'
+Plug 'sbdchd/neoformat'
+Plug 'autozimu/LanguageClient-neovim', {
+  \ 'branch' : 'next',
+  \ 'do' : 'bash install.sh',
+  \ }
+Plug 'Shougo/deoplete.nvim', { 'do' : 'UpdateRemotePlugins' }
 
 " Git
-Plugin 'tpope/vim-fugitive'
-Plugin 'airblade/vim-gitgutter'
-Plugin 'Xuyuanp/nerdtree-git-plugin'
+Plug 'tpope/vim-fugitive'
+Plug 'airblade/vim-gitgutter'
+Plug 'Xuyuanp/nerdtree-git-plugin'
 
 " Themes
-Plugin 'whatyouhide/vim-gotham'
-Plugin 'NLKNguyen/papercolor-theme'
+Plug 'whatyouhide/vim-gotham'
+Plug 'NLKNguyen/papercolor-theme'
 
 " OSX specific
 if has("macunix")
-    Plugin 'rizzatti/funcoo.vim'
-    Plugin 'rizzatti/dash.vim'
+    Plug 'rizzatti/funcoo.vim'
+    Plug 'rizzatti/dash.vim'
 endif
 
+call plug#end()
+
 filetype plugin indent on
 
 set number
@@ -134,12 +138,15 @@ let g:airline#extensions#syntastic#enabled = 1
 let g:airline#extensions#tabline#enabled = 1
 let g:airline_theme='papercolor'
 
+set completeopt+=noselect
+
 let g:deoplete#enable_at_startup = 1
 let g:deoplete#auto_complete_start_length = 1
 let g:deoplete#omni#input_patterns = {}
 let g:deoplete#omni#input_patterns.scala = [ '[^. *\t]\.\w*', '[:\[,] ?\w*', '^import .*']
-let g:deoplete#omni#input_patterns.ocaml = '[.\w]+'
+let g:deoplete#omni#input_patterns.ocaml = '[^. *\t]\.\w*|\s\w*|#'
 let g:deoplete#sources#jedi#python_path = '/usr/local/bin/python3.6'
+
 let g:tern_request_timeout = 1
 let g:tern_show_signature_in_pum = '0'
 imap <expr> <TAB> pumvisible() ? '<C-n>' : '<TAB>'
@@ -150,3 +157,12 @@ endif
 
 autocmd! User GoyoEnter Limelight
 autocmd! User GoyoLeave Limelight!
+
+let g:opamshare = substitute(system('opam config var share'), '\n$', '', '''')
+execute "set rtp+=" . g:opamshare . "/merlin/vim"
+execute "set rtp+=" . g:opamshare . "/ocp-indent/vim"
+
+augroup fmt
+  autocmd!
+  autocmd BufWritePre * undojoin | Neoformat
+augroup END

.zshrc

@@ -26,7 +26,7 @@ COMPLETION_WAITING_DOTS="true"
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
-plugins=(encode64 git rsync scala sbt ssh-agent sudo)
+plugins=(docker encode64 git rsync scala sbt ssh-agent sudo)
 
 source $ZSH/oh-my-zsh.sh
 
@@ -43,8 +43,8 @@ unsetopt nomatch
 bindkey -e
 
 # Keep 1000 lines of history within the shell and save it to ~/.zsh_history:
-HISTSIZE=1000
-SAVEHIST=1000
+HISTSIZE=10000
+SAVEHIST=10000
 HISTFILE=~/.zsh_history
 
 zstyle ':completion:*' auto-description 'specify: %d'
@@ -105,3 +105,6 @@ alias gsub='git submodule'
 alias gsubu='git submodule update'
 
 source $HOME/.profile
+
+# opam configuration
+test -r /Users/dmelnychenko/.opam/opam-init/init.zsh && . /Users/dmelnychenko/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true