From 0e661311074ebb098e0c8ee874ffeb5b1c29b840 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 18 Oct 2020 23:05:59 +0200 Subject: [PATCH] Move plugin stuff to toml --- after/ftplugin/haskell.vim | 137 ------------------ after/plugin/plugin_settings.vim | 226 ----------------------------- plugins.toml | 240 +++++++++++++++++++++++++++++++ vimrc | 28 ---- 4 files changed, 240 insertions(+), 391 deletions(-) diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim index a1f462a..4b048f3 100644 --- a/after/ftplugin/haskell.vim +++ b/after/ftplugin/haskell.vim @@ -1,8 +1,5 @@ setlocal ts=2 sw=2 expandtab -"set background=light -"set guifont=Neep\ Medium\ Semi-Condensed\ 18 - " tags call CmdAlias('hasktags', '!hasktags -c .') @@ -15,9 +12,6 @@ call CmdAlias('Cc', 'Clap commits') map ctg :codex set tags=tags;/,codex.tags;/ -" classic ctags jump -" nnoremap gd - " nnoremap cgd :cs find g =expand("") nnoremap :cs find c =expand("") @@ -40,101 +34,6 @@ endfunction " au BufEnter /*.hs call LoadHscope() - - -"hoogle -nnoremap ho :Hoogle -nnoremap hc :HoogleClose - - -" haskell-vim -let g:haskell_classic_highlighting = 1 -let g:haskell_indent_disable = 0 -" let g:haskell_enable_quantification = 1 -" let g:haskell_enable_recursivedo = 1 -" let g:haskell_enable_arrowsyntax = 1 -" let g:haskell_enable_pattern_synonyms = 1 -" let g:haskell_enable_typeroles = 1 -let g:haskell_indent_if = 0 -let g:haskell_indent_case = 4 -let g:haskell_indent_let = 4 -let g:haskell_indent_where = 6 -let g:haskell_indent_before_where = 2 -let g:haskell_indent_after_bare_where = 2 -let g:haskell_indent_do = 4 -let g:haskell_indent_in = 0 -let g:haskell_indent_guard = 4 -" let g:haskell_disable_TH = 1 - -" vim-hindent -let g:hindent_on_save = 0 -let g:hindent_indent_size = 4 -let g:hindent_line_length = 80 - -" vim-stylishhask -let g:stylishask_on_save = 0 - -" haskellmode-vim -function! HaskellDocCurrentWord() - let word = expand("") - exe "IDoc " . word -endfunction - -" done by LSP now -nmap :call HaskellDocCurrentWord() - -" nmap :silent update HsimportModule -" nmap :silent update HsimportSymbol - - -" liquid-types -let g:vim_annotations_offset = '/.liquid/' - - -" autocmd BufWritePost *.hs call s:check_and_lint() -" function! s:check_and_lint() - " let l:path = expand('%:p') - " let l:qflist = ghcmod#make('check', l:path) - " call extend(l:qflist, ghcmod#make('lint', l:path)) - " call setqflist(l:qflist) - " cwindow - " if empty(l:qflist) - " echo "No errors found" - " endif -" endfunction - - -let g:ghcmod_hlint_options = ['--ignore=Eta reduce $'] - -" ALE -let g:ale_enabled = 0 -let g:ale_linters = {'haskell':[], 'c':['clang']} -" let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools', 'argon'], 'c':['clang']} -" let g:ale_fixers = { - " \ '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 - - -let g:neoformat_enabled_haskell = ['brittany'] - - - -" LSP -let g:LanguageClient_rootMarkers = ['cabal.project', '*.cabal', 'stack.yaml'] - -" \ 'haskell': ['ghcide', "--lsp"], -let g:LanguageClient_serverCommands = { - \ 'haskell': ['haskell-language-server-wrapper', '--lsp', '--logfile', $HOME.'/hls-server.log'], - \ } - - -let g:echodoc#enable_at_startup = 1 - - call deoplete#enable() call deoplete#custom#source('LanguageClient', \ 'min_pattern_length', @@ -142,42 +41,6 @@ call deoplete#custom#source('LanguageClient', inoremap pumvisible() ? "\" : "\" -let g:tagbar_type_haskell = { - \ 'ctagsbin' : 'hasktags', - \ 'ctagsargs' : '-x -c -o-', - \ 'kinds' : [ - \ 'm:modules:0:1', - \ 'd:data: 0:1', - \ 'd_gadt: data gadt:0:1', - \ 't:type names:0:1', - \ 'nt:new types:0:1', - \ 'c:classes:0:1', - \ 'cons:constructors:1:1', - \ 'c_gadt:constructor gadt:1:1', - \ 'c_a:constructor accessors:1:1', - \ 'ft:function types:1:1', - \ 'fi:function implementations:0:1', - \ 'i:instance:0:1', - \ 'o:others:0:1' - \ ], - \ 'sro' : '.', - \ 'kind2scope' : { - \ 'm' : 'module', - \ 'c' : 'class', - \ 'd' : 'data', - \ 't' : 'type', - \ 'i' : 'instance' - \ }, - \ 'scope2kind' : { - \ 'module' : 'm', - \ 'class' : 'c', - \ 'data' : 'd', - \ 'type' : 't', - \ 'instance' : 'i' - \ } -\ } - - " vim-lsp if executable('haskell-language-server-wrapper') au User lsp_setup call lsp#register_server({ diff --git a/after/plugin/plugin_settings.vim b/after/plugin/plugin_settings.vim index ab14894..e69de29 100644 --- a/after/plugin/plugin_settings.vim +++ b/after/plugin/plugin_settings.vim @@ -1,226 +0,0 @@ -" echodoc -" set cmdheight=2 -let g:echodoc#enable_at_startup = 1 -let g:echodoc#type = 'signature' - -"LanguageClient-neovim -" Required for operations modifying multiple buffers like rename. -set hidden - -let g:LanguageClient_autoStart = 0 -let g:LanguageClient_diagnosticsEnable = 1 -let g:LanguageClient_diagnosticsList = "Quickfix" -let g:LanguageClient_diagnosticsDisplay = { - \ 1: { - \ "name": "Error", - \ "texthl": "ALEError", - \ "signText": "✖", - \ "signTexthl": "ALEErrorSign", - \ "virtualTexthl": "Error", - \ }, - \ 2: { - \ "name": "Warning", - \ "texthl": "ALEWarning", - \ "signText": "⚠", - \ "signTexthl": "ALEWarningSign", - \ "virtualTexthl": "Virtual", - \ }, - \ 3: { - \ "name": "Information", - \ "texthl": "ALEInfo", - \ "signText": "ℹ", - \ "signTexthl": "ALEInfoSign", - \ "virtualTexthl": "Virtual", - \ }, - \ 4: { - \ "name": "Hint", - \ "texthl": "ALEInfo", - \ "signText": "➤", - \ "signTexthl": "ALEInfoSign", - \ "virtualTexthl": "Virtual", - \ }, - \ } - -" hi link ALEError Error -hi ALEError term=underline cterm=underline ctermfg=Red gui=undercurl guisp=Red -hi link ALEWarning Warning -hi Virtual cterm=italic ctermfg=10 gui=italic guifg=#4b5558 -hi link ALEInfo SpellCap - -let $LANGUAGECLIENT_DEBUG=1 -let g:LanguageClient_loggingLevel='DEBUG' -let g:LanguageClient_virtualTextPrefix = '' -let g:LanguageClient_loggingFile = expand('~/LanguageClient.log') -let g:LanguageClient_serverStderr = expand('~/LanguageServer.log') - - -" neosnippet -" Plugin key-mappings. -" Note: It must be "imap" and "smap". It uses mappings. -" imap (neosnippet_expand_or_jump) -" smap (neosnippet_expand_or_jump) -" xmap (neosnippet_expand_target) - -" SuperTab like snippets behavior. -" Note: It must be "imap" and "smap". It uses mappings. -" imap neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : pumvisible() ? "\" : "\" -" smap neosnippet#expandable_or_jumpable() ? "\(neosnippet_expand_or_jump)" : "\" - -" For conceal markers. -" if has('conceal') - " set conceallevel=2 concealcursor=niv -" endif -" Enable snipMate compatibility feature. -" let g:neosnippet#enable_snipmate_compatibility = 1 -" let g:neosnippet#snippets_directory='~/.vim/custom-snippets' - - -" rainbow -let g:rainbow_conf = { -\ 'guifgs': ['#DC322F', 'royalblue3', 'darkorange3', 'seagreen3'], -\ 'ctermfgs': ['lightred', 'lightblue', 'lightyellow', 'lightcyan', 'lightmagenta'], -\} -let g:rainbow_active = 1 - - -" vim airline -" let g:airline#extensions#tabline#enabled = 1 - - -" deoplete -let g:deoplete#enable_at_startup = 0 - -" ==== delimitMate ==== -let g:delimitMate_matchpairs = "(:),[:],{:}" -let g:delimitMate_expand_cr = 1 -let g:delimitMate_expand_space = 1 -let g:delimitMate_autoclose = 1 - - -" Solarized stuff -" let g:solarized_termtrans=0 -" let g:solarized_degrade=0 -" let g:solarized_bold=1 -" let g:solarized_underline=1 -" let g:solarized_italic=1 -" let g:solarized_termcolors=16 -" let g:solarized_contrast="normal" -let g:solarized_visibility="high" -" let g:solarized_diffmode="normal" -" let g:solarized_hitrail=0 -let g:solarized_menu=1 - - -" youcompleteme -let g:ycm_filetype_blacklist = { - \ 'notes' : 1, - \ 'markdown' : 1, - \ 'text' : 1, - \ 'java' : 1, - \} -let g:ycm_confirm_extra_conf = 0 -let g:ycm_global_ycm_extra_conf='~/.vim/.ycm_extra_conf.py' -let g:ycm_collect_identifiers_from_tags_files = 1 -let g:ycm_seed_identifiers_with_syntax = 0 -" let g:ycm_always_populate_location_list = 1 -let g:ycm_autoclose_preview_window_after_completion = 1 -let g:ycm_key_invoke_completion = '' -let g:ycm_key_list_select_completion = [''] -let g:ycm_key_list_previous_completion = [''] -" nnoremap :YcmCompleter GoToDefinition -let g:ycm_server_log_level = 'error' -let g:ycm_semantic_triggers = {'haskell' : ['. ', '$ ']} -let g:ycm_goto_buffer_command = 'horizontal-split' - - -" commenting -let NERDSpaceDelims=1 -let NERDCreateDefaultMappings=0 - -" haskellmode, needs to load early -let g:haddock_browser='/usr/bin/firefox' -let g:haddock_browser_callformat='%s file://%s >/dev/null 2>&1 &' - -" fastfold -let g:fastfold_savehook = 1 -let g:fastfold_fold_command_suffixes = ['x','X','a','A','o','O','c','C'] -let g:fastfold_fold_movement_commands = [']z', '[z', 'zj', 'zk'] - -let g:markdown_folding = 1 -let g:tex_fold_enabled = 1 -let g:vimsyn_folding = 'af' -let g:xml_syntax_folding = 1 -let g:html_syntax_folding = 1 -let g:javaScript_fold = 1 -let g:sh_fold_enabled= 7 -let g:ruby_fold = 1 -let g:perl_fold = 1 -let g:perl_fold_blocks = 1 -let g:r_syntax_folding = 1 -let g:rust_fold = 1 -let g:haskell_fold = 1 - -" tagbar -let g:tagbar_map_togglefold = ['za'] -let g:tagbar_map_togglecaseinsensitive = 'zi' - -" Nerdtree -let g:NERDTreeMapActivateNode = '' -let g:NERDTreeMapCustomOpen = '' -let g:NERDTreeMapOpenExpl = 'n' -let g:NERDTreeMapJumpNextSibling = '' -" let g:NERDTreeMapOpenSplit = '' -" use NERDTree instead of netrw -autocmd StdinReadPre * let s:std_in=1 -autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif - -" overwrite nonsense from editorconfig -let g:EditorConfig_max_line_indicator = 'none' -" let g:EditorConfig_preserve_formatoptions = 1 - - -" vim current word -let g:vim_current_word#highlight_current_word = 0 -hi default link CurrentWordTwins CursorColumn - -" vim-lsp -function! s:on_lsp_buffer_enabled() abort - setlocal omnifunc=lsp#complete - setlocal signcolumn=yes - if exists('+tagfunc') | setlocal tagfunc=lsp#tagfunc | endif - nmap gd (lsp-definition) - nmap gr (lsp-references) - " nmap gi (lsp-implementation) - " nmap gt (lsp-type-definition) - nmap rn (lsp-rename) - nmap .g (lsp-previous-diagnostic) - nmap ,g (lsp-next-diagnostic) - nmap T (lsp-hover) - nmap la (lsp-code-action) - nmap sd (lsp-document-diagnostics) - - " refer to doc to add more commands -endfunction - -augroup lsp_install - au! - " call s:on_lsp_buffer_enabled only for languages that has the server registered. - autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() -augroup END - -let g:lsp_auto_enable = 0 - -" command -nargs=0 LspStart call lsp#activate() - - -" clap -command -nargs=* Rag Clap grep ++query='' -let g:clap_layout = {'relative': 'editor', 'width': '95%', 'height': '33%', 'row': '33%', 'col': '5%'} -let g:clap_use_pure_python = 1 - -" vista -let g:vista#renderer#enable_icon = 0 -let g:vista_ctags_cmd = { - \ 'haskell': 'hasktags -x -o - -c', - \ 'yaml': 'hasktags -x -o - -c', - \ } diff --git a/plugins.toml b/plugins.toml index 379e751..bc63f7b 100644 --- a/plugins.toml +++ b/plugins.toml @@ -4,13 +4,33 @@ repo = 'mileszs/ack.vim' repo = 'vim-scripts/cmdalias.vim' [[plugins]] repo = 'Raimondi/delimitMate' +hook_add = ''' + let g:delimitMate_matchpairs = "(:),[:],{:}" + let g:delimitMate_expand_cr = 1 + let g:delimitMate_expand_space = 1 + let g:delimitMate_autoclose = 1 +''' [[plugins]] repo = 'vim-scripts/genindent.vim' [[plugins]] repo = 'scrooloose/nerdcommenter' +hook_add = ''' + let NERDSpaceDelims=1 + let NERDCreateDefaultMappings=0 +''' [[plugins]] repo = 'scrooloose/nerdtree' on_event = 'NERDTreeToggle' +hook_add = ''' + let g:NERDTreeMapActivateNode = '' + let g:NERDTreeMapCustomOpen = '' + let g:NERDTreeMapOpenExpl = 'n' + let g:NERDTreeMapJumpNextSibling = '' + " let g:NERDTreeMapOpenSplit = '' + " use NERDTree instead of netrw + autocmd StdinReadPre * let s:std_in=1 + autocmd VimEnter * if argc() == 1 && isdirectory(argv()[0]) && !exists("s:std_in") | exe 'NERDTree' argv()[0] | wincmd p | ene | exe 'cd '.argv()[0] | endif +''' [[plugins]] repo = 'Xuyuanp/nerdtree-git-plugin' on_event = 'NERDTreeToggle' @@ -30,26 +50,68 @@ repo = 'nixprime/cpsm' build = 'sh -c "PY3=ON ./install.sh"' [[plugins]] repo = 'liuchengxu/vista.vim' +hook_add = ''' + let g:vista#renderer#enable_icon = 0 + let g:vista_ctags_cmd = { + \ 'haskell': 'hasktags -x -o - -c', + \ 'yaml': 'hasktags -x -o - -c', + \ } +''' [[plugins]] repo = 'sbdchd/neoformat' +hook_add = ''' + let g:neoformat_enabled_haskell = ['brittany'] +''' [[plugins]] repo = 'AndrewRadev/bufferize.vim' [[plugins]] repo = 'vmchale/dhall-vim' [[plugins]] repo = 'Shougo/echodoc.vim' +hook_add = ''' + " set cmdheight=2 + let g:echodoc#enable_at_startup = 1 + let g:echodoc#type = 'signature' +''' [[plugins]] repo = 'tpope/vim-scriptease' [[plugins]] repo = 'Konfekt/FastFold' +hook_add = ''' + let g:fastfold_savehook = 1 + let g:fastfold_fold_command_suffixes = ['x','X','a','A','o','O','c','C'] + let g:fastfold_fold_movement_commands = [']z', '[z', 'zj', 'zk'] + let g:markdown_folding = 1 + let g:tex_fold_enabled = 1 + let g:vimsyn_folding = 'af' + let g:xml_syntax_folding = 1 + let g:html_syntax_folding = 1 + let g:javaScript_fold = 1 + let g:sh_fold_enabled= 7 + let g:ruby_fold = 1 + let g:perl_fold = 1 + let g:perl_fold_blocks = 1 + let g:r_syntax_folding = 1 + let g:rust_fold = 1 + let g:haskell_fold = 1 +''' [[plugins]] repo = 'editorconfig/editorconfig-vim' +hook_add = ''' + " overwrite nonsense from editorconfig + let g:EditorConfig_max_line_indicator = 'none' + " let g:EditorConfig_preserve_formatoptions = 1 +''' [[plugins]] repo = 'hasufell/ghcup.vim' [[plugins]] repo = 'junegunn/vim-easy-align' [[plugins]] repo = 'dominikduda/vim_current_word' +hook_add = ''' + let g:vim_current_word#highlight_current_word = 0 + hi default link CurrentWordTwins CursorColumn +''' #[[plugins]] # repo = 'vim-airline/vim-airline' #[[plugins]] @@ -63,6 +125,11 @@ repo = 'kshenoy/vim-signature' [[plugins]] repo = 'liuchengxu/vim-clap' build = 'make' +hook_add = ''' + command -nargs=* Rag Clap grep ++query= + let g:clap_layout = {'relative': 'editor', 'width': '95%', 'height': '33%', 'row': '33%', 'col': '5%'} + let g:clap_use_pure_python = 1 +''' # scm [[plugins]] @@ -73,6 +140,10 @@ repo = 'tpope/vim-rhubarb' repo = 'tommcdo/vim-fubitive' [[plugins]] repo = 'airblade/vim-gitgutter' +hook_add = ''' + " https://github.com/airblade/vim-gitgutter/issues/696 + autocmd ColorScheme * highlight! link SignColumn LineNr +''' # local vimrc [[plugins]] @@ -85,8 +156,33 @@ repo = 'LucHermitte/local_vimrc' #repo = 'Valloric/YouCompleteMe' #build = './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang' #on_ft = ['c', 'go', 'clojure'] +#hook_add = ''' +# youcompleteme +# let g:ycm_filetype_blacklist = { +# \ 'notes' : 1, +# \ 'markdown' : 1, +# \ 'text' : 1, +# \ 'java' : 1, +# \} +# let g:ycm_confirm_extra_conf = 0 +# let g:ycm_global_ycm_extra_conf='~/.vim/.ycm_extra_conf.py' +# let g:ycm_collect_identifiers_from_tags_files = 1 +# let g:ycm_seed_identifiers_with_syntax = 0 +# " let g:ycm_always_populate_location_list = 1 +# let g:ycm_autoclose_preview_window_after_completion = 1 +# let g:ycm_key_invoke_completion = '' +# let g:ycm_key_list_select_completion = [''] +# let g:ycm_key_list_previous_completion = [''] +# " nnoremap :YcmCompleter GoToDefinition +# let g:ycm_server_log_level = 'error' +# let g:ycm_semantic_triggers = {'haskell' : ['. ', '$ ']} +# let g:ycm_goto_buffer_command = 'horizontal-split' +#''' [[plugins]] repo = 'Shougo/deoplete.nvim' +hook_add = ''' + let g:deoplete#enable_at_startup = 0 +''' [[plugins]] repo = 'roxma/nvim-yarp' on_if = '!has("nvim")' @@ -99,14 +195,111 @@ on_if = '!has("nvim")' repo = 'w0rp/ale' build = 'bash -c "cp -R ~/.vim/ale_linters ."' on_ft = ['sh', 'vim'] +hook_add = ''' + let g:ale_enabled = 0 + let g:ale_linters = {'haskell':[], 'c':['clang']} + " let g:ale_linters = {'haskell':['ghc-mod', 'hdevtools', 'argon'], 'c':['clang']} + " let g:ale_fixers = { + " \ '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 +''' # LSP [[plugins]] repo = 'autozimu/LanguageClient-neovim' rev = 'dev' build = 'bash ./install.sh' +hook_add = ''' + " Required for operations modifying multiple buffers like rename. + set hidden + + let g:LanguageClient_autoStart = 0 + let g:LanguageClient_diagnosticsEnable = 1 + let g:LanguageClient_diagnosticsList = "Quickfix" + let g:LanguageClient_diagnosticsDisplay = { + \ 1: { + \ "name": "Error", + \ "texthl": "ALEError", + \ "signText": "✖", + \ "signTexthl": "ALEErrorSign", + \ "virtualTexthl": "Error", + \ }, + \ 2: { + \ "name": "Warning", + \ "texthl": "ALEWarning", + \ "signText": "⚠", + \ "signTexthl": "ALEWarningSign", + \ "virtualTexthl": "Virtual", + \ }, + \ 3: { + \ "name": "Information", + \ "texthl": "ALEInfo", + \ "signText": "ℹ", + \ "signTexthl": "ALEInfoSign", + \ "virtualTexthl": "Virtual", + \ }, + \ 4: { + \ "name": "Hint", + \ "texthl": "ALEInfo", + \ "signText": "➤", + \ "signTexthl": "ALEInfoSign", + \ "virtualTexthl": "Virtual", + \ }, + \ } + + " hi link ALEError Error + hi ALEError term=underline cterm=underline ctermfg=Red gui=undercurl guisp=Red + hi link ALEWarning Warning + hi Virtual cterm=italic ctermfg=10 gui=italic guifg=#4b5558 + hi link ALEInfo SpellCap + + let $LANGUAGECLIENT_DEBUG=1 + let g:LanguageClient_loggingLevel='DEBUG' + let g:LanguageClient_virtualTextPrefix = '' + let g:LanguageClient_loggingFile = expand('~/LanguageClient.log') + let g:LanguageClient_serverStderr = expand('~/LanguageServer.log') + + let g:LanguageClient_rootMarkers = {'haskell': ['cabal.project', '*.cabal', 'stack.yaml'] } + + let g:LanguageClient_serverCommands = { + \ 'haskell': ['haskell-language-server-wrapper', '--lsp', '--logfile', $HOME.'/hls-server.log'], + \ } +''' #[[plugins]] #repo = 'prabirshrestha/vim-lsp' +#hook_add = ''' +# function! s:on_lsp_buffer_enabled() abort +# setlocal omnifunc=lsp#complete +# setlocal signcolumn=yes +# if exists('+tagfunc') | setlocal tagfunc=lsp#tagfunc | endif +# nmap gd (lsp-definition) +# nmap gr (lsp-references) +# " nmap gi (lsp-implementation) +# " nmap gt (lsp-type-definition) +# nmap rn (lsp-rename) +# nmap .g (lsp-previous-diagnostic) +# nmap ,g (lsp-next-diagnostic) +# nmap T (lsp-hover) +# nmap la (lsp-code-action) +# nmap sd (lsp-document-diagnostics) +# +# " refer to doc to add more commands +# endfunction +# +# augroup lsp_install +# au! +# " call s:on_lsp_buffer_enabled only for languages that has the server registered. +# autocmd User lsp_buffer_enabled call s:on_lsp_buffer_enabled() +# augroup END +# +# let g:lsp_auto_enable = 0 +# +# " command -nargs=0 LspStart call lsp#activate() +#''' # snippets #[[plugins]] @@ -118,17 +311,50 @@ build = 'bash ./install.sh' [[plugins]] repo = 'luochen1990/rainbow' on_ft = ['clojure', 'haskell', 'python'] +hook_add = ''' + let g:rainbow_conf = { + \ 'guifgs': ['#DC322F', 'royalblue3', 'darkorange3', 'seagreen3'], + \ 'ctermfgs': ['lightred', 'lightblue', 'lightyellow', 'lightcyan', 'lightmagenta'], + \} + let g:rainbow_active = 1 +''' # haskell [[plugins]] repo = 'neovimhaskell/haskell-vim' on_ft = ['haskell', 'cabal'] +hook_add = ''' + let g:haskell_classic_highlighting = 1 + let g:haskell_indent_disable = 0 + " let g:haskell_enable_quantification = 1 + " let g:haskell_enable_recursivedo = 1 + " let g:haskell_enable_arrowsyntax = 1 + " let g:haskell_enable_pattern_synonyms = 1 + " let g:haskell_enable_typeroles = 1 + let g:haskell_indent_if = 0 + let g:haskell_indent_case = 4 + let g:haskell_indent_let = 4 + let g:haskell_indent_where = 6 + let g:haskell_indent_before_where = 2 + let g:haskell_indent_after_bare_where = 2 + let g:haskell_indent_do = 4 + let g:haskell_indent_in = 0 + let g:haskell_indent_guard = 4 + " let g:haskell_disable_TH = 1 +''' [[plugins]] repo = 'Twinside/vim-hoogle' on_ft = ['haskell'] +hook_add = ''' + nnoremap ho :Hoogle + nnoremap hc :HoogleClose +''' [[plugins]] repo = 'alx741/vim-stylishask' on_ft = ['haskell'] +hook_add = ''' + let g:stylishask_on_save = 0 +''' [[plugins]] repo = 'fatih/vim-go' @@ -198,6 +424,16 @@ on_ft = ['typescript'] # repo = 'flazz/vim-colorschemes' [[plugins]] repo = 'overcache/NeoSolarized' +hook_add = ''' + let g:neosolarized_contrast = 'normal' + let g:neosolarized_visibility = 'normal' + let g:neosolarized_vertSplitBgTrans = 0 + let g:neosolarized_bold = 1 + let g:neosolarized_underline = 1 + let g:neosolarized_italic = 1 + set background=dark + colorscheme NeoSolarized +''' # repo = 'reedes/vim-colors-pencil' # [[plugins]] # repo = 'whatyouhide/vim-gotham' @@ -206,6 +442,10 @@ repo = 'overcache/NeoSolarized' # [[plugins]] # repo = 'morhetz/gruvbox' +# toml +[[plugins]] +repo = 'https://github.com/cespare/vim-toml' + # unmanaged [[plugins]] name = 'L9' diff --git a/vimrc b/vimrc index c169409..3d498a7 100644 --- a/vimrc +++ b/vimrc @@ -116,34 +116,6 @@ try catch endtry -" git-gutter workaround -" https://github.com/airblade/vim-gitgutter/issues/696 -autocmd ColorScheme * highlight! link SignColumn LineNr - -" ==========colors=========== -" set t_Co=256 -let g:solarized_termcolors=256 - -if exists('g:GtkGuiLoaded') - let g:neosolarized_contrast = 'normal' - let g:neosolarized_visibility = 'normal' - let g:neosolarized_vertSplitBgTrans = 0 - let g:neosolarized_bold = 1 - let g:neosolarized_underline = 1 - let g:neosolarized_italic = 1 - set background=dark - colorscheme NeoSolarized -else - let g:neosolarized_contrast = 'normal' - let g:neosolarized_visibility = 'normal' - let g:neosolarized_vertSplitBgTrans = 0 - let g:neosolarized_bold = 1 - let g:neosolarized_underline = 1 - let g:neosolarized_italic = 1 - set background=dark - colorscheme NeoSolarized -endif - " ===========================