overhaul of vim setup

tmux-files/tmux.conf

@@ -33,6 +33,9 @@ set-option -g set-titles-string '[#S:#I #H] #W'
 set -g mouse-utf8 on
 set -g mouse on
 
+# clipboard
+set -g set-clipboard off
+
 # big scrollback
 set -g history-limit 10240
 

vim-files/vim/ftplugin/elixir.vim

@@ -1,10 +0,0 @@
-let g:neomake_elixir_mix_maker = {
-      \ 'exe' : 'mix',
-      \ 'args': ['compile', '--warnings-as-errors'],
-      \ 'cwd': getcwd(),
-      \ 'errorformat':
-        \ '** %s %f:%l: %m,' .
-        \ '%f:%l: warning: %m'
-      \ }
-
-let g:neomake_elixir_enabled_makers = ['mix']

vim-files/vim/ftplugin/javascript.vim

@@ -1 +0,0 @@
-let g:neomake_javascript_enabled_makers = ['eslint']

vim-files/vim/ftplugin/python.vim

@@ -1,6 +1,3 @@
-" Neomake
-let g:neomake_python_enabled_makers = ['flake8']
-
 """ Handy remaps
 noremap <leader>b Oimport ipdb;ipdb.set_trace()<Esc>
 

vim-files/vim/ftplugin/ruby.vim

@@ -1,5 +1,2 @@
-" Neomake
-let g:neomake_ruby_enabled_makers = ['rubocop']
-
 " Vim-Test
 let test#ruby#rspec#executable = 'bundle exec rspec'

vim-files/vim/init.vim

@@ -8,47 +8,46 @@ Plug 'tpope/vim-sensible'
 
 Plug 'nanotech/jellybeans.vim'
 
+Plug 'pangloss/vim-javascript'
+  Plug 'mxw/vim-jsx'
+Plug 'kchmck/vim-coffee-script'
+  Plug 'mtscout6/vim-cjsx'
+Plug 'elixir-lang/vim-elixir'
+  Plug 'slashmili/alchemist.vim'
+Plug 'vim-ruby/vim-ruby'
+  Plug 'tpope/vim-bundler'
+  Plug 'tpope/vim-rails'
+Plug 'tpope/vim-endwise'
+Plug 'ElmCast/elm-vim'
+
 Plug 'bling/vim-airline'
+Plug 'luochen1990/rainbow'
 Plug 'myusuf3/numbers.vim'
 Plug 'mhinz/vim-signify'
 Plug 'nathanaelkane/vim-indent-guides'
-Plug 'kien/rainbow_parentheses.vim'
 
 Plug 'danro/rename.vim'
 Plug 'pbrisbin/vim-mkdir'
-Plug 'Lokaltog/vim-easymotion'
 Plug 'tpope/vim-characterize'
 Plug 'tpope/vim-surround'
 Plug 'tpope/vim-commentary'
-Plug 'tpope/tpope-vim-abolish'
-Plug 'terryma/vim-multiple-cursors'
-
 Plug 'tpope/vim-eunuch'
+Plug 'junegunn/vim-easy-align'
 
 Plug 'majutsushi/tagbar'
-Plug 'SirVer/ultisnips'
 Plug 'zhaocai/GoldenView.Vim'
 
-
+Plug 'Lokaltog/vim-easymotion'
 Plug 'tpope/vim-fugitive'
 Plug 'tpope/vim-vinegar'
 Plug 'ctrlpvim/ctrlp.vim'
 Plug 'simnalamburt/vim-mundo'
 Plug 'janko-m/vim-test'
 
-Plug 'tpope/vim-endwise'
+Plug 'w0rp/ale'
-
+Plug 'SirVer/ultisnips'
-Plug 'benekastah/neomake'
+  Plug 'honza/vim-snippets'
-Plug 'Valloric/YouCompleteMe'
+Plug 'Valloric/YouCompleteMe', { 'do': 'yes \| ./install.py --tern-completer' }
-
-Plug 'vim-ruby/vim-ruby'
-Plug 'elmcast/elm-vim'
-Plug 'pangloss/vim-javascript'
-Plug 'kchmck/vim-coffee-script'
-Plug 'mtscout6/vim-cjsx'
-Plug 'mxw/vim-jsx'
-
-Plug 'tpope/vim-rails'
 
 call plug#end()
 
@@ -62,6 +61,9 @@ nnoremap K :YcmCompleter GoTo<CR>
 nnoremap ˚ :YcmCompleter GoToDeclaration<CR>
 let g:ycm_goto_buffer_command = 'horizontal-split'
 let g:ycm_autoclose_preview_window_after_insertion = 1
+let g:ycm_semantic_triggers = {
+      \ 'elm' : ['.'],
+      \}
 
 " Easymotion
 map / <Plug>(easymotion-sn)
@@ -82,9 +84,10 @@ if executable('ag')
   " ag is fast enough that CtrlP doesn't need to cache
   let g:ctrlp_use_caching = 0
 endif
+let g:ctrlp_custom_ignore="node_modules\|\.git\|_build"
 
-" Gundo
+" Mundo
-map <leader>u :GundoToggle<CR>
+map <leader>u :MundoToggle<CR>
 
 " Indent guides
 let g:indent_guides_start_level = 2
@@ -93,14 +96,16 @@ let g:indent_guides_start_level = 2
 let g:syntastic_quiet_messages = {'level': []} " do NOT silence warnings
 let g:syntastic_aggregate_errors = 1
 
-" Neomake
-autocmd! BufWritePost * Neomake
-
 " NERDTree / netrw
 let g:netrw_liststyle = 3 " let netrw look like NERDTree
 
 " Rainbow parentheses
-autocmd VimEnter * RainbowParenthesesToggleAll
+let g:rainbow_conf = {
+\ 'guifgs': ['RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3'],
+\ 'ctermfgs': ['red', 'brown', 'blue', 'gray', 'green', 'magenta', 'cyan', 'darkred', 'brown', 'darkblue', 'gray', 'darkgreen', 'darkmagenta', 'darkcyan', 'red'],
+\ 'parentheses': ['start=/(/ end=/)/ fold', 'start=/\[/ end=/\]/ fold', 'start=/{/ end=/}/ fold']
+\}
+let g:rainbow_active = 1
 
 " Vim-Test
 nmap <silent> <leader>t :TestNearest<CR>
@@ -113,16 +118,8 @@ if has('nvim')
 endif
 
 " UltiSnips
-let g:UltiSnipsUsePythonVersion = 2 " required for YCM compat
+let g:UltiSnipsUsePythonVersion = 3 " required for YCM compat
 let g:ulti_expand_or_jump_res = 0
-function! ExpandSnippetOrCarriageReturn()
-    let snippet = UltiSnips#ExpandSnippetOrJump()
-    if g:ulti_expand_or_jump_res > 0
-        return snippet
-    else
-        return "\<CR>"
-    endif
-endfunction
 
 " IndentGuides
 let g:indent_guides_enable_on_vim_startup = 1
@@ -131,6 +128,10 @@ let g:indent_guides_enable_on_vim_startup = 1
 autocmd BufRead * EnableGoldenViewAutoResize
 let g:goldenview__enable_default_mapping = 0
 
+" Easy Align
+nmap ga <Plug>(EasyAlign)
+xmap ga <Plug>(EasyAlign)
+
 """" END PLUGIN SETTINGS
 
 let mapleader=","
@@ -139,9 +140,9 @@ set noswapfile
 set pastetoggle=<F2>
 set nowrap
 
+syntax on
 filetype on
 filetype plugin indent on
-syntax on
 
 try
   colorscheme jellybeans
@@ -199,6 +200,8 @@ set hlsearch
 set gdefault
 
 """ Folding
+set foldmethod=syntax
+set foldlevel=1
 set nofoldenable
 
 "recalculate the trailing whitespace warning when idle, and after saving
@@ -210,7 +213,7 @@ autocmd BufWritePre * :%s/\s\+$//e
 """ Handy remaps
 noremap ; :
 inoremap jj <Esc>
-map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
+map <silent> <leader>V :source ~/.config/nvim/init.vim<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
 map \q :q<CR>
 map \w :w<CR>
 noremap Q <nop>
@@ -218,6 +221,7 @@ noremap Q <nop>
 "terminal remaps
 if has('nvim')
   tnoremap <Esc> <C-\><C-n>
+  nnoremap <leader>o :below 10sp term://$SHELL<cr>i
 endif
 
 " Quicker window movement

vim-files/vimrc

@@ -1,254 +0,0 @@
-set nocompatible " required
-filetype off " required
-
-"""" VIM-PLUG
-call plug#begin('~/.vim/plugged')
-
-Plug 'tpope/vim-sensible'
-
-Plug 'nanotech/jellybeans.vim'
-
-Plug 'pangloss/vim-javascript'
-Plug 'kchmck/vim-coffee-script'
-Plug 'mtscout6/vim-cjsx'
-Plug 'mxw/vim-jsx'
-Plug 'elixir-lang/vim-elixir'
-Plug 'vim-ruby/vim-ruby'
-Plug 'lambdatoast/elm.vim'
-
-Plug 'tpope/vim-rails'
-
-Plug 'bling/vim-airline'
-Plug 'myusuf3/numbers.vim'
-Plug 'mhinz/vim-signify'
-Plug 'nathanaelkane/vim-indent-guides'
-
-Plug 'danro/rename.vim'
-Plug 'pbrisbin/vim-mkdir'
-Plug 'Lokaltog/vim-easymotion'
-Plug 'tpope/vim-characterize'
-Plug 'tpope/vim-surround'
-Plug 'tpope/vim-commentary'
-
-Plug 'tpope/vim-eunuch'
-
-Plug 'majutsushi/tagbar'
-Plug 'honza/vim-snippets'
-Plug 'zhaocai/GoldenView.Vim'
-
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-vinegar'
-Plug 'ctrlpvim/ctrlp.vim'
-Plug 'simnalamburt/vim-mundo'
-Plug 'vim-ruby/vim-ruby'
-Plug 'tpope/vim-bundler'
-Plug 'tpope/vim-rails'
-Plug 'janko-m/vim-test'
-
-Plug 'tpope/vim-endwise'
-
-Plug 'benekastah/neomake'
-Plug 'Valloric/YouCompleteMe', { 'do': 'yes \| ./install.py --tern-completer' }
-
-Plug 'luochen1990/rainbow'
-
-call plug#end()
-
-filetype plugin indent on     " required
-""" end vim-plug
-
-"""" PLUGIN SETTINGS
-
-" YouCompleteMe
-nnoremap K :YcmCompleter GoTo<CR>
-nnoremap ˚ :YcmCompleter GoToDeclaration<CR>
-let g:ycm_goto_buffer_command = 'horizontal-split'
-let g:ycm_autoclose_preview_window_after_insertion = 1
-
-" Easymotion
-map / <Plug>(easymotion-sn)
-omap / <Plug>(easymotion-tn)
-map n <Plug>(easymotion-next)
-map N <Plug>(easymotion-prev)
-let g:EasyMotion_landing_highlight = 0
-
-" CtrlP
-" Use The Silver Searcher https://github.com/ggreer/the_silver_searcher
-if executable('ag')
-  " Use Ag over Grep
-  set grepprg=ag\ --nogroup\ --nocolor
-
-  " Use ag in CtrlP for listing files. Lightning fast and respects .gitignore
-  let g:ctrlp_user_command = 'ag %s -l --nocolor -g ""'
-
-  " ag is fast enough that CtrlP doesn't need to cache
-  let g:ctrlp_use_caching = 0
-endif
-let g:ctrlp_custom_ignore="node_modules\|\.git\|_build"
-
-" Mundo
-map <leader>u :MundoToggle<CR>
-
-" Indent guides
-let g:indent_guides_start_level = 2
-
-" Syntastic
-let g:syntastic_quiet_messages = {'level': []} " do NOT silence warnings
-let g:syntastic_aggregate_errors = 1
-
-" Neomake
-" elixir maker executes code, jesus
-let g:neomake_elixir_enabled_makers = []
-autocmd! BufWritePost * Neomake
-
-" NERDTree / netrw
-let g:netrw_liststyle = 3 " let netrw look like NERDTree
-
-" Rainbow parentheses
-let g:rainbow_conf = {
-\ 'guifgs': ['RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'DarkOrchid3', 'firebrick3', 'RoyalBlue3', 'SeaGreen3', 'DarkOrchid3', 'firebrick3'],
-\ 'ctermfgs': ['red', 'brown', 'blue', 'gray', 'green', 'magenta', 'cyan', 'darkred', 'brown', 'darkblue', 'gray', 'darkgreen', 'darkmagenta', 'darkcyan', 'red'],
-\ 'parentheses': ['start=/(/ end=/)/ fold', 'start=/\[/ end=/\]/ fold', 'start=/{/ end=/}/ fold']
-\}
-let g:rainbow_active = 1
-
-" Vim-Test
-nmap <silent> <leader>t :TestNearest<CR>
-nmap <silent> <leader>T :TestFile<CR>
-nmap <silent> <leader>a :TestSuite<CR>
-nmap <silent> <leader>l :TestLast<CR>
-nmap <silent> <leader>g :TestVisit<CR>
-if has('nvim')
-  let test#strategy = "neovim"
-endif
-
-" UltiSnips
-let g:UltiSnipsUsePythonVersion = 2 " required for YCM compat
-let g:ulti_expand_or_jump_res = 0
-function! ExpandSnippetOrCarriageReturn()
-    let snippet = UltiSnips#ExpandSnippetOrJump()
-    if g:ulti_expand_or_jump_res > 0
-        return snippet
-    else
-        return "\<CR>"
-    endif
-endfunction
-
-" IndentGuides
-let g:indent_guides_enable_on_vim_startup = 1
-
-" GoldenView
-autocmd BufRead * EnableGoldenViewAutoResize
-let g:goldenview__enable_default_mapping = 0
-
-"""" END PLUGIN SETTINGS
-
-let mapleader=","
-set nobackup
-set noswapfile
-set pastetoggle=<F2>
-set nowrap
-
-syntax on
-filetype on
-filetype plugin indent on
-
-try
-  colorscheme jellybeans
-catch
-  " deal with it
-endtry
-
-set t_Co=256
-if &term =~ 'xterm-color'
-    set t_ut=
-endif
-set nocompatible
-set laststatus=2
-
-if v:version >= 703
-    "undo settings
-    set undodir=~/.vim/undofiles
-    set undofile
-    let &colorcolumn="80,".join(range(120,999), ",")
-endif
-
-
-set hidden
-set showmode
-set number
-set numberwidth=1
-set background=dark
-set cursorline
-set cursorcolumn
-set ruler
-" do not redraw while macroing
-set lazyredraw
-
-set matchpairs+=<:>
-
-set list
-set listchars=tab:>-,trail:-,extends:>,precedes:<,nbsp:+,eol:$
-set ts=2
-set shiftwidth=2
-set expandtab
-
-" Open new split panes to right and bottom, which feels more natural
-set splitbelow
-set splitright
-
-" Use the OS clipboard by default (on versions compiled with `+clipboard`)
-set clipboard=unnamed
-
-""" Searching and Patterns
-set ignorecase
-set smartcase
-set smarttab
-set hlsearch
-" Add the g flag to search/replace by default
-set gdefault
-
-""" Folding
-set nofoldenable
-
-"recalculate the trailing whitespace warning when idle, and after saving
-autocmd cursorhold,bufwritepost * unlet! b:statusline_trailing_space_warning
-
-" strip trailing whitespace
-autocmd BufWritePre * :%s/\s\+$//e
-
-""" Handy remaps
-noremap ; :
-inoremap jj <Esc>
-map <silent> <leader>V :source ~/.vimrc<CR>:filetype detect<CR>:exe ":echo 'vimrc reloaded'"<CR>
-map \q :q<CR>
-map \w :w<CR>
-noremap Q <nop>
-
-"terminal remaps
-if has('nvim')
-  tnoremap <Esc> <C-\><C-n>
-  nnoremap <leader>o :below 10sp term://$SHELL<cr>i
-endif
-
-" Quicker window movement
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-h> <C-w>h
-nnoremap <C-l> <C-w>l
-
-" Don’t reset cursor to start of line when moving around.
-set nostartofline
-" minimal number of lines to keep above/below cursorline
-set scrolloff=10
-
-""" Use the mouse
-set mouse=a
-
-""" smart path
-set path=.,,**
-
-" Local overrides?
-if filereadable($HOME . "/.vimrc.local")
-  source ~/.vimrc.local
-endif