From 2f040373bb93903ac0a00afd9a1d099c281ad43a Mon Sep 17 00:00:00 2001
From: yushyin <yushyin@saga>
Date: Thu, 12 Mar 2020 13:03:01 +0100
Subject: vim config

---
 vim/files/after/ftplugin/haskell.vim |  1 +
 vim/files/dein.toml                  |  3 +++
 vim/files/vimrc                      | 16 ++++++++--------
 3 files changed, 12 insertions(+), 8 deletions(-)
 create mode 100644 vim/files/after/ftplugin/haskell.vim

diff --git a/vim/files/after/ftplugin/haskell.vim b/vim/files/after/ftplugin/haskell.vim
new file mode 100644
index 0000000..eb4194c
--- /dev/null
+++ b/vim/files/after/ftplugin/haskell.vim
@@ -0,0 +1 @@
+setl omnifunc=lsp#complete
diff --git a/vim/files/dein.toml b/vim/files/dein.toml
index 372f4c6..b51db5f 100644
--- a/vim/files/dein.toml
+++ b/vim/files/dein.toml
@@ -29,6 +29,9 @@ repo = 'cespare/vim-toml'
 [[plugins]]
 repo = 'ledger/vim-ledger'
 
+[[plugins]]
+repo = 'rodjek/vim-puppet'
+
 [[plugins]]
 repo = 'sirtaj/vim-openscad'
 
diff --git a/vim/files/vimrc b/vim/files/vimrc
index ac03d93..4677b0f 100644
--- a/vim/files/vimrc
+++ b/vim/files/vimrc
@@ -54,7 +54,7 @@ if dein#tap('denite.nvim')
 	nmap <leader>d [Denite]
 
 	nnoremap [Denite]g :<C-u>Denite grep -auto-preview -split=no -no-empty<CR>
-	nnoremap [Denite]f :<C-u>Denite file/rec -mode=insert -split=no<CR>
+	nnoremap [Denite]f :<C-u>Denite file/rec -start-filter -split=no<CR>
 	nnoremap [Denite]l :<C-u>Denite buffer file/old -split=no<CR>
 	nnoremap [Denite]r :<C-u>Denite -resume -refresh<CR>
 
@@ -112,7 +112,7 @@ if dein#tap('vim-lsp')
 			\ 'whitelist': ['c', 'cpp', 'objc', 'objcpp'],
 			\ })
 	endif
-	if executable('rls')
+	if executable('rustup')
 		au User lsp_setup call lsp#register_server({
 			\ 'name': 'rls',
 			\ 'cmd': {server_info->['rustup', 'run', 'nightly', 'rls']},
@@ -121,14 +121,12 @@ if dein#tap('vim-lsp')
 
 		au FileType rust setl omnifunc=lsp#complete
 	endif
-	if executable('hie-wrapper')
+	if executable('ghcide')
 		au User lsp_setup call lsp#register_server({
-			\ 'name': 'hie',
-			\ 'cmd': {server_info->['hie-wrapper']},
+			\ 'name': 'ghcide',
+			\ 'cmd': {server_info->['cabal', 'exec', 'ghcide', '--', '--lsp']},
 			\ 'whitelist': ['haskell'],
 			\ })
-
-		au FileType haskell setl omnifunc=lsp#complete
 	endif
 
 	nnoremap [Lsp] <Nop>
@@ -145,12 +143,14 @@ if dein#tap('base16-vim')
 	colorscheme base16-monokai
 endif
 
+let g:markdown_fenced_languages = ['haskell']
+
 filetype plugin indent on
 syntax on
 
 set ai
 set bs=2
-set cc=80
+set cc=80,120
 set fdm=syntax
 set formatoptions+=j
 set lcs=tab:\│\ ,trail:·,eol:¬
-- 
cgit v1.2.3-24-g4f1b