From adac7168bc7ae0e48aa27c0dfe3cc53e90858fa7 Mon Sep 17 00:00:00 2001 From: Julian Ospald Date: Sun, 18 Oct 2020 19:45:39 +0200 Subject: [PATCH] Update --- after/ftplugin/haskell.vim | 12 +++------ after/plugin/plugin_settings.vim | 12 +++++---- plugin/keys.vim | 46 +++++++++++++++++++++----------- plugins.toml | 21 +++++++++++---- vimrc | 40 +++++++++++++-------------- 5 files changed, 74 insertions(+), 57 deletions(-) diff --git a/after/ftplugin/haskell.vim b/after/ftplugin/haskell.vim index 461238b..a1f462a 100644 --- a/after/ftplugin/haskell.vim +++ b/after/ftplugin/haskell.vim @@ -21,7 +21,7 @@ set tags=tags;/,codex.tags;/ " nnoremap cgd :cs find g =expand("") nnoremap :cs find c =expand("") -set cscopeprg=do_at_stack_root\ hscope +" set cscopeprg=do_at_stack_root\ hscope set csre set csto=1 " search codex tags first set nocst @@ -37,7 +37,7 @@ function! LoadHscope() endif set cscopeverbose endfunction -au BufEnter /*.hs call LoadHscope() +" au BufEnter /*.hs call LoadHscope() @@ -128,7 +128,7 @@ let g:LanguageClient_rootMarkers = ['cabal.project', '*.cabal', 'stack.yaml'] " \ 'haskell': ['ghcide', "--lsp"], let g:LanguageClient_serverCommands = { - \ 'haskell': ['haskell-language-server-wrapper', '--lsp'], + \ 'haskell': ['haskell-language-server-wrapper', '--lsp', '--logfile', $HOME.'/hls-server.log'], \ } @@ -178,12 +178,6 @@ let g:tagbar_type_haskell = { \ } -" vista -let g:vista_ctags_cmd = { - \ 'haskell': 'hasktags -x -o - -c', - \ } - - " 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 aa35017..ab14894 100644 --- a/after/plugin/plugin_settings.vim +++ b/after/plugin/plugin_settings.vim @@ -183,11 +183,6 @@ let g:EditorConfig_max_line_indicator = 'none' let g:vim_current_word#highlight_current_word = 0 hi default link CurrentWordTwins CursorColumn - -" vista -let g:vista#renderer#enable_icon = 0 - - " vim-lsp function! s:on_lsp_buffer_enabled() abort setlocal omnifunc=lsp#complete @@ -222,3 +217,10 @@ let g:lsp_auto_enable = 0 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/plugin/keys.vim b/plugin/keys.vim index 396853c..a6b962f 100644 --- a/plugin/keys.vim +++ b/plugin/keys.vim @@ -1,6 +1,8 @@ nnoremap let g:mapleader = ' ' +inoremap + " nnoremap tk T @@ -8,6 +10,11 @@ nnoremap tk T nnoremap o o nnoremap O O +" nnoremap +" nnoremap +" inoremap +" inoremap + " workman noremap noremap @@ -69,12 +76,6 @@ nnoremap w inoremap cnoremap -" half scroll up and down -noremap -noremap -map - - " jump word in visual mode -- TODO " In insert or command mode, move normally by using Ctrl @@ -232,19 +233,30 @@ vnoremap 6j " scrolling nnoremap 10 -inoremap 10i +" inoremap 10i vnoremap 10 nnoremap 10 -inoremap 10i +" inoremap 10i vnoremap 10 -nnoremap 10 -inoremap 10i -vnoremap 10 -nnoremap 10 -inoremap 10i -vnoremap 10 +nnoremap 10 +" inoremap 10i +vnoremap 10 +nnoremap 10 +" inoremap 10i +vnoremap 10 +nnoremap +" inoremap i +vnoremap +nnoremap +" inoremap i +vnoremap + +" half scroll up and down +noremap +noremap +map " F keys " nmap :noh @@ -323,8 +335,9 @@ nmap :YcmCompleter GoTo:wincmd o nnoremap ag :Clap grep ++query= " nnoremap tg :Clap proj_tags ++query= nmap :Clap files -nmap :Clap tags +nmap :Clap tags nmap :Clap buffers +nnoremap tb :Clap tags ++query= nnoremap tg :tag =expand("") nnoremap tp :ptag =expand("") @@ -379,5 +392,6 @@ nnoremap gd :call LanguageClient#textDocument_definition() nnoremap la :call LanguageClient#textDocument_codeAction() nnoremap rn :call LanguageClient#textDocument_rename() - +nnoremap ,g (lcn-diagnostics-next) +nnoremap .g (lcn-diagnostics-prev) diff --git a/plugins.toml b/plugins.toml index d84b52d..379e751 100644 --- a/plugins.toml +++ b/plugins.toml @@ -56,6 +56,8 @@ repo = 'dominikduda/vim_current_word' # repo = 'vim-airline/vim-airline-themes' [[plugins]] repo = 'mkitt/tabline.vim' +[[plugins]] +repo = 'kshenoy/vim-signature' # finder [[plugins]] @@ -79,10 +81,10 @@ repo = 'LucHermitte/lh-vim-lib' repo = 'LucHermitte/local_vimrc' # completion -[[plugins]] -repo = 'Valloric/YouCompleteMe' -build = './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang' -on_ft = ['c', 'go', 'clojure'] +#[[plugins]] +#repo = 'Valloric/YouCompleteMe' +#build = './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang' +#on_ft = ['c', 'go', 'clojure'] [[plugins]] repo = 'Shougo/deoplete.nvim' [[plugins]] @@ -195,7 +197,7 @@ on_ft = ['typescript'] # [[plugins]] # repo = 'flazz/vim-colorschemes' [[plugins]] -repo = 'altercation/vim-colors-solarized' +repo = 'overcache/NeoSolarized' # repo = 'reedes/vim-colors-pencil' # [[plugins]] # repo = 'whatyouhide/vim-gotham' @@ -206,28 +208,36 @@ repo = 'altercation/vim-colors-solarized' # unmanaged [[plugins]] +name = 'L9' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'L9' [[plugins]] +name = 'ScrollColor' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'ScrollColor' [[plugins]] +name = 'bufonly' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'bufonly' [[plugins]] +name = 'colorschemedgrade' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'colorschemedegrade' [[plugins]] +name = 'exheres-syntax' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'exheres-syntax-20160116' [[plugins]] +name = 'fontzoom' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'fontzoom' on_if = '!has("nvim")' [[plugins]] +name = 'fuzzyfinder' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'fuzzyfinder' [[plugins]] +name = 'log' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'log' #[[plugins]] @@ -237,5 +247,6 @@ rtp = 'log' #repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' #rtp = 'tslime' [[plugins]] +name = 'txtfmt' repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git' rtp = 'txtfmt' diff --git a/vimrc b/vimrc index 4abfdd0..c169409 100644 --- a/vimrc +++ b/vimrc @@ -123,29 +123,25 @@ autocmd ColorScheme * highlight! link SignColumn LineNr " ==========colors=========== " set t_Co=256 let g:solarized_termcolors=256 -set background=dark -colorscheme solarized -if has('nvim') - 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 +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 " ===========================