Use ctrlP caching

after/ftplugin/cabal.vim

@@ -0,0 +1 @@
+setlocal expandtab

after/ftplugin/haskell.vim

@@ -7,7 +7,45 @@ syntax on
 filetype plugin indent on
 
 
-call CmdAlias('hasktags', '!/home/jule/.cabal/bin/hasktags -c .<CR>')
+" tags
+call CmdAlias('hasktags', '!hasktags -c .<CR>')
+
+" from
+" https://raw.githubusercontent.com/begriffs/haskell-vim-now/master/git-hscope
+call CmdAlias('codex', 'call system("haskell-ctags")<CR><CR>call LoadHscope()<CR>')
+
+
+map <leader>tg :codex<CR>
+set tags=tags;/,codex.tags;/
+
+nnoremap <leader>gd <C-]>
+nnoremap <silent> <leader>cgd :cs find g <C-R>=expand("<cword>")<CR><CR>
+nnoremap <silent> <C-\> :cs find c <C-R>=expand("<cword>")<CR><CR>
+
+set cscopeprg=do_at_stack_root\ hscope
+set csre
+set csto=1 " search codex tags first
+set nocst
+" set cscopequickfix=s-,c-,d-,i-,t-,e-,a-
+
+function! LoadHscope()
+	set nocscopeverbose " suppress 'duplicate connection' error
+	let hsf = findfile("hscope.out", ".;")
+	if filereadable(hsf)
+		exe "cs add " . hsf
+	elseif $HSCOPE_DB != ""
+		cs add $HSCOPE_DB
+	endif
+	set cscopeverbose
+endfunction
+au BufEnter /*.hs call LoadHscope()
+
+
+
+
+"hoogle
+nnoremap <leader>ho :Hoogle<CR>
+nnoremap <leader>hc :HoogleClose<CR>
 
 
 " haskell-vim
@@ -58,43 +96,48 @@ let g:vim_annotations_offset = '/.liquid/'
 
 
 " LSP
-let g:LanguageClient_autoStart = 1
+let g:LanguageClient_autoStart = 0
 let g:LanguageClient_serverCommands = {
-	\ 'haskell': ['hie', '--lsp', '-d', '-l', $HOME.'/lang-server.log'],
+	\ 'haskell': ['hie-wrapper', '--lsp', '-d', '-l', $HOME.'/lang-server.log'],
 	\ }
 " we use ALE instead
 let g:LanguageClient_diagnosticsEnable = 0
 
 nnoremap <leader>lc :call LanguageClient_contextMenu()<CR>
-nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
+" nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
 nnoremap <silent> <C-F6> :call LanguageClient#textDocument_hover()<CR>
-nnoremap <silent> <F8> :call LanguageClient#textDocument_rename()<CR>
+vnoremap <silent> <C-F6> :call LanguageClient#textDocument_hover()<CR>
+nnoremap <silent> <C-F8> :call LanguageClient#textDocument_rename()<CR>
 
 " deoplete
 call deoplete#custom#option('sources',{
 	\ '_': ['buffer'],
-	\ 'haskell': ['neosnippet', 'buffer', 'file', 'LanguageClient']
+	\ 'haskell': ['neosnippet', 'buffer', 'file', 'neco-ghc']
 	\ })
+	" \ 'haskell': ['neosnippet', 'buffer', 'file', 'neco-ghc']
 " inoremap <expr><tab> pumvisible() ? "\<c-n>" : "\<tab>"
 call deoplete#enable()
-
+call deoplete#enable_logging('DEBUG', $HOME . '/deoplete.log')
 
 let g:ghcmod_hlint_options = ['--ignore=Eta reduce $']
 
 " ALE
-let g:ale_enabled = 1
+let g:ale_enabled = 0
-let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools'], 'c':['clang']}
+let g:ale_linters = {'haskell':[], 'c':['clang']}
+" let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools', 'argon'], 'c':['clang']}
 " let g:ale_fixers = {
-	" \    'go': ['gofmt', 'goimports'],
+	" \    'haskell': ['brittany'],
 	" \}
 let g:ale_haskell_hdevtools_options = "-g '-Wall' -g '-Wno-orphans'"
+let g:ale_haskell_argon_error_level = 14
+let g:ale_haskell_argon_warn_level = 10
+let g:ale_haskell_argon_info_level = 6
 
 " completion
 "
 " neco-ghc
 " let g:necoghc_enable_detailed_browse = 1
 " let g:haskellmode_completion_ghc = 0
-" let g:necoghc_enable_detailed_browse = 1
 " autocmd FileType haskell setlocal omnifunc=necoghc#omnifunc
 " let g:ycm_semantic_triggers = {'haskell' : ['.']}
 
@@ -130,10 +173,16 @@ nmap <F6> :GhcModType<CR>
 	" let g:intero_window_size = 15
 
 	" " Sets the intero window to split vertically; default is horizontal
-	" let g:intero_vertical_split = 1
+	" " let g:intero_vertical_split = 1
+
+	" " let g:intero_ghci_options = '-dynamic'
 
 	" " OPTIONAL: Make the update time shorter, so the type info will trigger faster.
 	" set updatetime=1000
 
 	" map <silent> <leader>t <Plug>InteroGenericType
+	" nnoremap <silent> <leader>jd :InteroGoToDef<CR>
+	" map <silent> <leader>T <Plug>InteroType
+	" nnoremap <silent> <leader>it :InteroTypeInsert<CR>
+	" nnoremap <leader>ist :InteroSetTargets<SPACE>
 " endif

ale_linters/haskell/argon.vim

@@ -0,0 +1,69 @@
+" Author: Julian Ospald <hasufell@hasufell.de>
+" Description: argon for Haskell files
+
+call ale#Set('haskell_argon_executable', 'argon')
+call ale#Set('haskell_argon_options', '')
+call ale#Set('haskell_argon_error_level', 12)
+call ale#Set('haskell_argon_warn_level', 8)
+call ale#Set('haskell_argon_info_level', 4)
+
+
+function! ale_linters#haskell#argon#GetExecutable(buffer) abort
+    return ale#Var(a:buffer, 'haskell_argon_executable')
+endfunction
+
+
+function! ale_linters#haskell#argon#GetCommand(buffer) abort
+    return ale#Escape(ale_linters#haskell#argon#GetExecutable(a:buffer))
+    \   . ' '
+    \   . ale#Var(a:buffer, 'haskell_argon_options')
+    \   . ' -m ' . ale#Var(a:buffer, 'haskell_argon_info_level')
+    \   . ' -j'
+    \   . ' %t'
+endfunction
+
+
+function! ale_linters#haskell#argon#Handle(buffer, lines) abort
+    let l:output = []
+
+    for l:error in ale#util#FuzzyJSONDecode(a:lines, [])
+		if !has_key(l:error, 'blocks')
+			" this cannot be formatted properly into an ALE error
+			execute 'echom ''[argon] '' l:error.message'
+			return l:output
+		endif
+		for l:block in l:error.blocks
+			let l:complexity = l:block.complexity
+
+			if l:complexity >= ale#Var(a:buffer, 'haskell_argon_error_level')
+				let l:type = 'E'
+				let l:max_c = ale#Var(a:buffer, 'haskell_argon_error_level')
+			elseif l:complexity >= ale#Var(a:buffer, 'haskell_argon_warn_level')
+				let l:type = 'W'
+				let l:max_c = ale#Var(a:buffer, 'haskell_argon_warn_level')
+			else
+				let l:type = 'I'
+				let l:max_c = ale#Var(a:buffer, 'haskell_argon_info_level')
+			endif
+
+			call add(l:output, {
+			\   'filename': l:error.path,
+			\   'lnum': l:block.lineno,
+			\   'col': l:block.col,
+			\   'text': l:block.name . ': cyclomatic complexity of '  . l:complexity,
+			\   'type': l:type,
+			\})
+		endfor
+    endfor
+
+    return l:output
+endfunction
+
+
+call ale#linter#Define('haskell', {
+\   'name': 'argon',
+\   'executable_callback': 'ale_linters#haskell#argon#GetExecutable',
+\   'command_callback': 'ale_linters#haskell#argon#GetCommand',
+\   'callback': 'ale_linters#haskell#argon#Handle',
+\})
+

custom-snippets/haskell.snippets

@@ -0,0 +1,4 @@
+snippet docsec
+	    ------------------------
+	    --[ ${0:DOCUMENT SECTION} ]--
+	    ------------------------

custom-snippets/markdown.snippets

@@ -0,0 +1,2 @@
+snippet tc
+    \textcolor{${1:red}}{${0}}

plugin/keys.vim

@@ -37,6 +37,9 @@ noremap <leader>bd <Esc>:bd<CR>
 noremap <leader>wc <Esc>:bd<CR>
 noremap <leader>bo <Esc>:Bufonly<CR>
 
+" close preview
+nmap <C-p> :pc<CR>
+
 " Remap window commands
 " map <leader>ws <Esc>:wincmd s<CR>
 " map <leader>wv <Esc>:wincmd v<CR>

unmanaged-vim-plug/fuzzyfinder/autoload/fuf.vim

@@ -706,6 +706,11 @@ let s:FUF_BUF_NAME = '[fuf]'
 
 "
 function s:activateFufBuffer()
+  " Save the last window number so we can switch back to it later (otherwise,
+  " at least with more recent versions of Vim, we end up with the top left
+  " window focused)
+  let s:fuf_buffer_last_winnr = winnr()
+
   " lcd . : To avoid the strange behavior that unnamed buffer changes its cwd
   "         if 'autochdir' was set on.
   lcd .
@@ -733,6 +738,7 @@ function s:deactivateFufBuffer()
     AutoComplPopUnlock
   endif
   call l9#tempbuffer#close(s:FUF_BUF_NAME)
+  exec s:fuf_buffer_last_winnr . "wincmd w"
 endfunction
 
 " }}}1

unmanaged-vim-plug/fuzzyfinder/fd41e8d68b6774324b58c02692b896a6a36a0397.patch

@@ -0,0 +1,36 @@
+From fd41e8d68b6774324b58c02692b896a6a36a0397 Mon Sep 17 00:00:00 2001
+From: David Wolever <david@wolever.net>
+Date: Thu, 1 Jun 2017 10:11:43 -0400
+Subject: [PATCH] Fix focus top left window bug
+
+With newer versions of Vim, the top left window will be focused after
+opening the fuf menu. This patch restores the window focus after the
+menu is closed.
+---
+ autoload/fuf.vim | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/autoload/fuf.vim b/autoload/fuf.vim
+index fe9e6eb..78be490 100644
+--- a/autoload/fuf.vim
++++ b/autoload/fuf.vim
+@@ -706,6 +706,11 @@ let s:FUF_BUF_NAME = '[fuf]'
+ 
+ "
+ function s:activateFufBuffer()
++  " Save the last window number so we can switch back to it later (otherwise,
++  " at least with more recent versions of Vim, we end up with the top left
++  " window focused)
++  let s:fuf_buffer_last_winnr = winnr()
++
+   " lcd . : To avoid the strange behavior that unnamed buffer changes its cwd
+   "         if 'autochdir' was set on.
+   lcd .
+@@ -733,6 +738,7 @@ function s:deactivateFufBuffer()
+     AutoComplPopUnlock
+   endif
+   call l9#tempbuffer#close(s:FUF_BUF_NAME)
++  exec s:fuf_buffer_last_winnr . "wincmd w"
+ endfunction
+ 
+ " }}}1

vimrc

@@ -44,14 +44,13 @@ Plug 'tpope/vim-rhubarb'
 Plug 'sjbach/lusty'
 if has("nvim")
 	Plug 'iCyMind/NeoSolarized'
-	Plug 'vim-airline/vim-airline'
-else
-	Plug 'powerline/powerline', {
-		\ 'branch': 'develop',
-		\ 'do': 'python3 setup.py install --user',
-		\ 'rtp': 'powerline/bindings/vim',
-		\ }
 endif
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'kien/ctrlp.vim'
+Plug 'hasufell/cpsm', { 'do': 'PY3=ON ./install.sh' }
+Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+Plug 'junegunn/fzf.vim'
 
 " local_vimrc
 Plug 'LucHermitte/lh-vim-lib'
@@ -85,33 +84,35 @@ Plug 'autozimu/LanguageClient-neovim', {
 Plug 'junegunn/fzf', { 'for': 'haskell' }
 
 " linting/compilation
-Plug 'w0rp/ale'
+Plug 'w0rp/ale', {
+	\ 'do': 'bash -c \"cp -R ~/.vim/ale_linters .\"',
+	\ }
 
 " haskell
 " if has("nvim")
 	" Plug 'parsonsmatt/intero-neovim'
 " endif
-Plug 'eagletmt/ghcmod-vim', { 'for': 'haskell' }
+" Plug 'eagletmt/ghcmod-vim', { 'for': 'haskell' }
 " completion based on ghc-mod, not LSP
 " Plug 'eagletmt/neco-ghc', { 'for': 'haskell' }
 Plug 'lukerandall/haskellmode-vim', { 'for': 'haskell' }
-Plug 'neovimhaskell/haskell-vim', { 'for': 'haskell' }
+Plug 'neovimhaskell/haskell-vim', { 'for': ['haskell', 'cabal'] }
-Plug 'ucsd-progsys/liquid-types.vim', { 'for': 'haskell' }
+" Plug 'ucsd-progsys/liquid-types.vim', { 'for': 'haskell' }
 Plug 'bitc/lushtags', {
-    \ 'do': 'bash -c \"cabal clean && cabal sandbox delete && cabal sandbox init && cabal install && cp .cabal-sandbox/bin/lushtags ~/.cabal/bin/lushtags\"',
+    \ 'do': 'bash -c \"stack install\"',
     \ 'for': 'haskell',
     \ }
 " Plug 'timmytofu/vim-cabal-context', { 'for': 'haskell' }
 Plug 'itchyny/vim-haskell-indent', { 'for': 'haskell' }
 Plug 'dan-t/vim-hsimport', { 'for': 'haskell' }
+Plug 'Twinside/vim-hoogle', { 'for': 'haskell' }
 
 " clojure
-" Plug '~/.vim/unmanaged-vim-plug/paredit', { 'for': 'clojure' }
 " Plug '~/.vim/unmanaged-vim-plug/tslime', { 'for': 'clojure' }
 Plug 'guns/vim-slamhound', {'for': 'clojure'}
-Plug 'guns/vim-sexp', {'for': 'clojure'}
+" Plug 'guns/vim-sexp', {'for': 'clojure'}
-Plug 'tpope/vim-sexp-mappings-for-regular-people', {'for': 'clojure'}
+" Plug 'tpope/vim-sexp-mappings-for-regular-people', {'for': 'clojure'}
-Plug 'kovisoft/paredit', {'for': 'clojure'}
+" Plug 'kovisoft/paredit', {'for': 'clojure'}
 Plug 'tpope/vim-salve', { 'for': 'clojure' }
 Plug 'tpope/vim-projectionist', { 'for': 'clojure' }
 Plug 'tpope/vim-dispatch', { 'for': 'clojure' }
@@ -160,12 +161,6 @@ so ~/.vim/plugged/cmdalias.vim/plugin/cmdalias.vim
 
 
 if !has("nvim")
-	"powerline
-	python3 from powerline.vim import setup as powerline_setup
-	python3 powerline_setup()
-	python3 del powerline_setup
-	set laststatus=2
-
 	" lj
 	let g:LustyJugglerSuppressRubyWarning = 1
 endif
@@ -192,14 +187,18 @@ if has('conceal')
 endif
 " Enable snipMate compatibility feature.
 let g:neosnippet#enable_snipmate_compatibility = 1
-let g:neosnippet#disable_runtime_snippets = 1
+let g:neosnippet#snippets_directory='~/.vim/custom-snippets'
+
+
+" vim airline
+" let g:airline#extensions#tabline#enabled = 1
 
 
 " LSP
 let g:LanguageClient_autoStart = 0
 
 " deoplete
-let g:deoplete#enable_at_startup = 0
+let g:deoplete#enable_at_startup = 1
 
 " ==== delimitMate ====
 let g:delimitMate_matchpairs = "(:),[:],{:}"
@@ -252,6 +251,25 @@ let NERDCreateDefaultMappings=0
 let g:haddock_browser='/usr/bin/firefox'
 let g:haddock_browser_callformat='%s file://%s >/dev/null 2>&1 &'
 
+" ctrlp
+let g:ctrlp_user_command = 'fd --type f --color=never "" %s'
+let g:ctrlp_use_caching = 1
+let g:ctrlp_match_func = { 'match': 'cpsm#CtrlPMatch' }
+
+" fzf
+" --column: Show column number
+" --line-number: Show line number
+" --no-heading: Do not show file headings in results
+" --fixed-strings: Search term as a literal string
+" --ignore-case: Case insensitive search
+" --no-ignore: Do not respect .gitignore, etc...
+" --hidden: Search hidden files and folders
+" --follow: Follow symlinks
+" --glob: Additional conditions for search (in this case ignore everything in the .git/ folder)
+" --color: Search color options
+command! -bang -nargs=* Find call fzf#vim#grep('rg --column --line-number --no-heading --fixed-strings --ignore-case --no-ignore --hidden --follow --glob "!.git/*" --color "always" '.shellescape(<q-args>), 1, <bang>0)
+
+
 
 " ==== conque ====
 " command aliases
@@ -294,7 +312,7 @@ vnoremap x "_x
 nnoremap x "_x
 
 " Syntax
-syntax enable
+syntax on
 
 " pane navigation
 " Use ctrl-[hjkl] to select the active split!