Update
This commit is contained in:
parent
f559e8b242
commit
adac7168bc
@ -21,7 +21,7 @@ set tags=tags;/,codex.tags;/
|
|||||||
" nnoremap <silent> <leader>cgd :cs find g <C-R>=expand("<cword>")<CR><CR>
|
" 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>
|
nnoremap <silent> <C-\> :cs find c <C-R>=expand("<cword>")<CR><CR>
|
||||||
|
|
||||||
set cscopeprg=do_at_stack_root\ hscope
|
" set cscopeprg=do_at_stack_root\ hscope
|
||||||
set csre
|
set csre
|
||||||
set csto=1 " search codex tags first
|
set csto=1 " search codex tags first
|
||||||
set nocst
|
set nocst
|
||||||
@ -37,7 +37,7 @@ function! LoadHscope()
|
|||||||
endif
|
endif
|
||||||
set cscopeverbose
|
set cscopeverbose
|
||||||
endfunction
|
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"],
|
" \ 'haskell': ['ghcide', "--lsp"],
|
||||||
let g:LanguageClient_serverCommands = {
|
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
|
" vim-lsp
|
||||||
if executable('haskell-language-server-wrapper')
|
if executable('haskell-language-server-wrapper')
|
||||||
au User lsp_setup call lsp#register_server({
|
au User lsp_setup call lsp#register_server({
|
||||||
|
@ -183,11 +183,6 @@ let g:EditorConfig_max_line_indicator = 'none'
|
|||||||
let g:vim_current_word#highlight_current_word = 0
|
let g:vim_current_word#highlight_current_word = 0
|
||||||
hi default link CurrentWordTwins CursorColumn
|
hi default link CurrentWordTwins CursorColumn
|
||||||
|
|
||||||
|
|
||||||
" vista
|
|
||||||
let g:vista#renderer#enable_icon = 0
|
|
||||||
|
|
||||||
|
|
||||||
" vim-lsp
|
" vim-lsp
|
||||||
function! s:on_lsp_buffer_enabled() abort
|
function! s:on_lsp_buffer_enabled() abort
|
||||||
setlocal omnifunc=lsp#complete
|
setlocal omnifunc=lsp#complete
|
||||||
@ -222,3 +217,10 @@ let g:lsp_auto_enable = 0
|
|||||||
command -nargs=* Rag Clap grep ++query='<args>'
|
command -nargs=* Rag Clap grep ++query='<args>'
|
||||||
let g:clap_layout = {'relative': 'editor', 'width': '95%', 'height': '33%', 'row': '33%', 'col': '5%'}
|
let g:clap_layout = {'relative': 'editor', 'width': '95%', 'height': '33%', 'row': '33%', 'col': '5%'}
|
||||||
let g:clap_use_pure_python = 1
|
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',
|
||||||
|
\ }
|
||||||
|
@ -1,6 +1,8 @@
|
|||||||
nnoremap <SPACE> <Nop>
|
nnoremap <SPACE> <Nop>
|
||||||
let g:mapleader = ' '
|
let g:mapleader = ' '
|
||||||
|
|
||||||
|
inoremap <C-u> <Esc>
|
||||||
|
|
||||||
"
|
"
|
||||||
nnoremap <Leader>tk <C-w><C-]><C-w>T
|
nnoremap <Leader>tk <C-w><C-]><C-w>T
|
||||||
|
|
||||||
@ -8,6 +10,11 @@ nnoremap <Leader>tk <C-w><C-]><C-w>T
|
|||||||
nnoremap <Leader>o o<Esc>
|
nnoremap <Leader>o o<Esc>
|
||||||
nnoremap <Leader>O O<Esc>
|
nnoremap <Leader>O O<Esc>
|
||||||
|
|
||||||
|
" nnoremap <kPageUp> <PageUp>
|
||||||
|
" nnoremap <kPageDown> <PageDown>
|
||||||
|
" inoremap <kPageUp> <PageUp>
|
||||||
|
" inoremap <kPageDown> <PageDown>
|
||||||
|
|
||||||
" workman
|
" workman
|
||||||
noremap <C-K> <C-O>
|
noremap <C-K> <C-O>
|
||||||
noremap <Tab> <C-I>
|
noremap <Tab> <C-I>
|
||||||
@ -69,12 +76,6 @@ nnoremap <A-i> w
|
|||||||
inoremap <c-j> <c-n>
|
inoremap <c-j> <c-n>
|
||||||
cnoremap <c-j> <c-n>
|
cnoremap <c-j> <c-n>
|
||||||
|
|
||||||
" half scroll up and down
|
|
||||||
noremap <C-A-p> <C-u>
|
|
||||||
noremap <C-A-u> <C-d>
|
|
||||||
map <C-d> <Nop>
|
|
||||||
|
|
||||||
|
|
||||||
" jump word in visual mode -- TODO
|
" jump word in visual mode -- TODO
|
||||||
|
|
||||||
" In insert or command mode, move normally by using Ctrl
|
" In insert or command mode, move normally by using Ctrl
|
||||||
@ -232,19 +233,30 @@ vnoremap <C-e> 6j
|
|||||||
|
|
||||||
" scrolling
|
" scrolling
|
||||||
nnoremap <S-PageUp> 10<C-Y>
|
nnoremap <S-PageUp> 10<C-Y>
|
||||||
inoremap <S-PageUp> <Esc>10<C-Y>i
|
" inoremap <S-PageUp> <Esc>10<C-Y>i
|
||||||
vnoremap <S-PageUp> 10<C-Y>
|
vnoremap <S-PageUp> 10<C-Y>
|
||||||
nnoremap <S-PageDown> 10<C-E>
|
nnoremap <S-PageDown> 10<C-E>
|
||||||
inoremap <S-PageDown> <Esc>10<C-E>i
|
" inoremap <S-PageDown> <Esc>10<C-E>i
|
||||||
vnoremap <S-PageDown> 10<C-E>
|
vnoremap <S-PageDown> 10<C-E>
|
||||||
|
|
||||||
nnoremap <C-p> 10<C-Y>
|
nnoremap <A-p> 10<C-Y>
|
||||||
inoremap <C-p> <Esc>10<C-Y>i
|
" inoremap <A-p> <Esc>10<C-Y>i
|
||||||
vnoremap <C-p> 10<C-Y>
|
vnoremap <A-p> 10<C-Y>
|
||||||
nnoremap <C-u> 10<C-E>
|
nnoremap <A-u> 10<C-E>
|
||||||
inoremap <C-u> <Esc>10<C-E>i
|
" inoremap <A-u> <Esc>10<C-E>i
|
||||||
vnoremap <C-u> 10<C-E>
|
vnoremap <A-u> 10<C-E>
|
||||||
|
|
||||||
|
nnoremap <C-p> <C-u>
|
||||||
|
" inoremap <C-p> <Esc><C-u>i
|
||||||
|
vnoremap <C-p> <C-u>
|
||||||
|
nnoremap <C-u> <C-d>
|
||||||
|
" inoremap <C-u> <Esc><C-d>i
|
||||||
|
vnoremap <C-u> <C-d>
|
||||||
|
|
||||||
|
" half scroll up and down
|
||||||
|
noremap <C-A-p> <C-b>
|
||||||
|
noremap <C-A-u> <C-f>
|
||||||
|
map <C-d> <Nop>
|
||||||
|
|
||||||
" F keys
|
" F keys
|
||||||
" nmap <F2> :noh<CR>
|
" nmap <F2> :noh<CR>
|
||||||
@ -323,8 +335,9 @@ nmap <C-F4> :YcmCompleter GoTo<CR>:wincmd o<CR>
|
|||||||
nnoremap <leader>ag :Clap grep ++query=<cword><CR>
|
nnoremap <leader>ag :Clap grep ++query=<cword><CR>
|
||||||
" nnoremap <silent> <leader>tg :Clap proj_tags ++query=<cword><CR>
|
" nnoremap <silent> <leader>tg :Clap proj_tags ++query=<cword><CR>
|
||||||
nmap <C-f> :Clap files<CR>
|
nmap <C-f> :Clap files<CR>
|
||||||
nmap <C-t> :Clap tags<CR>
|
nmap <F2> :Clap tags<CR>
|
||||||
nmap <C-b> :Clap buffers<CR>
|
nmap <C-b> :Clap buffers<CR>
|
||||||
|
nnoremap <silent> <leader>tb :Clap tags ++query=<cword><CR>
|
||||||
|
|
||||||
nnoremap <silent> <leader>tg :tag <C-R>=expand("<cword>")<CR><CR>
|
nnoremap <silent> <leader>tg :tag <C-R>=expand("<cword>")<CR><CR>
|
||||||
nnoremap <silent> <leader>tp :ptag <C-R>=expand("<cword>")<CR><CR>
|
nnoremap <silent> <leader>tp :ptag <C-R>=expand("<cword>")<CR><CR>
|
||||||
@ -379,5 +392,6 @@ nnoremap <silent> gd :call LanguageClient#textDocument_definition()<CR>
|
|||||||
nnoremap <leader>la :call LanguageClient#textDocument_codeAction()<CR>
|
nnoremap <leader>la :call LanguageClient#textDocument_codeAction()<CR>
|
||||||
nnoremap <leader>rn :call LanguageClient#textDocument_rename()<CR>
|
nnoremap <leader>rn :call LanguageClient#textDocument_rename()<CR>
|
||||||
|
|
||||||
|
nnoremap ,g <Plug>(lcn-diagnostics-next)
|
||||||
|
nnoremap .g <Plug>(lcn-diagnostics-prev)
|
||||||
|
|
||||||
|
21
plugins.toml
21
plugins.toml
@ -56,6 +56,8 @@ repo = 'dominikduda/vim_current_word'
|
|||||||
# repo = 'vim-airline/vim-airline-themes'
|
# repo = 'vim-airline/vim-airline-themes'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
repo = 'mkitt/tabline.vim'
|
repo = 'mkitt/tabline.vim'
|
||||||
|
[[plugins]]
|
||||||
|
repo = 'kshenoy/vim-signature'
|
||||||
|
|
||||||
# finder
|
# finder
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
@ -79,10 +81,10 @@ repo = 'LucHermitte/lh-vim-lib'
|
|||||||
repo = 'LucHermitte/local_vimrc'
|
repo = 'LucHermitte/local_vimrc'
|
||||||
|
|
||||||
# completion
|
# completion
|
||||||
[[plugins]]
|
#[[plugins]]
|
||||||
repo = 'Valloric/YouCompleteMe'
|
#repo = 'Valloric/YouCompleteMe'
|
||||||
build = './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang'
|
#build = './install.py --clang-completer --go-completer --rust-completer --system-boost --system-libclang'
|
||||||
on_ft = ['c', 'go', 'clojure']
|
#on_ft = ['c', 'go', 'clojure']
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
repo = 'Shougo/deoplete.nvim'
|
repo = 'Shougo/deoplete.nvim'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
@ -195,7 +197,7 @@ on_ft = ['typescript']
|
|||||||
# [[plugins]]
|
# [[plugins]]
|
||||||
# repo = 'flazz/vim-colorschemes'
|
# repo = 'flazz/vim-colorschemes'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
repo = 'altercation/vim-colors-solarized'
|
repo = 'overcache/NeoSolarized'
|
||||||
# repo = 'reedes/vim-colors-pencil'
|
# repo = 'reedes/vim-colors-pencil'
|
||||||
# [[plugins]]
|
# [[plugins]]
|
||||||
# repo = 'whatyouhide/vim-gotham'
|
# repo = 'whatyouhide/vim-gotham'
|
||||||
@ -206,28 +208,36 @@ repo = 'altercation/vim-colors-solarized'
|
|||||||
|
|
||||||
# unmanaged
|
# unmanaged
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'L9'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'L9'
|
rtp = 'L9'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'ScrollColor'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'ScrollColor'
|
rtp = 'ScrollColor'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'bufonly'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'bufonly'
|
rtp = 'bufonly'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'colorschemedgrade'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'colorschemedegrade'
|
rtp = 'colorschemedegrade'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'exheres-syntax'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'exheres-syntax-20160116'
|
rtp = 'exheres-syntax-20160116'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'fontzoom'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'fontzoom'
|
rtp = 'fontzoom'
|
||||||
on_if = '!has("nvim")'
|
on_if = '!has("nvim")'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'fuzzyfinder'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'fuzzyfinder'
|
rtp = 'fuzzyfinder'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'log'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'log'
|
rtp = 'log'
|
||||||
#[[plugins]]
|
#[[plugins]]
|
||||||
@ -237,5 +247,6 @@ rtp = 'log'
|
|||||||
#repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
#repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
#rtp = 'tslime'
|
#rtp = 'tslime'
|
||||||
[[plugins]]
|
[[plugins]]
|
||||||
|
name = 'txtfmt'
|
||||||
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
|
||||||
rtp = 'txtfmt'
|
rtp = 'txtfmt'
|
||||||
|
40
vimrc
40
vimrc
@ -123,29 +123,25 @@ autocmd ColorScheme * highlight! link SignColumn LineNr
|
|||||||
" ==========colors===========
|
" ==========colors===========
|
||||||
" set t_Co=256
|
" set t_Co=256
|
||||||
let g:solarized_termcolors=256
|
let g:solarized_termcolors=256
|
||||||
set background=dark
|
|
||||||
colorscheme solarized
|
|
||||||
|
|
||||||
if has('nvim')
|
if exists('g:GtkGuiLoaded')
|
||||||
if exists('g:GtkGuiLoaded')
|
let g:neosolarized_contrast = 'normal'
|
||||||
let g:neosolarized_contrast = 'normal'
|
let g:neosolarized_visibility = 'normal'
|
||||||
let g:neosolarized_visibility = 'normal'
|
let g:neosolarized_vertSplitBgTrans = 0
|
||||||
let g:neosolarized_vertSplitBgTrans = 0
|
let g:neosolarized_bold = 1
|
||||||
let g:neosolarized_bold = 1
|
let g:neosolarized_underline = 1
|
||||||
let g:neosolarized_underline = 1
|
let g:neosolarized_italic = 1
|
||||||
let g:neosolarized_italic = 1
|
set background=dark
|
||||||
set background=dark
|
colorscheme NeoSolarized
|
||||||
colorscheme NeoSolarized
|
else
|
||||||
else
|
let g:neosolarized_contrast = 'normal'
|
||||||
let g:neosolarized_contrast = 'normal'
|
let g:neosolarized_visibility = 'normal'
|
||||||
let g:neosolarized_visibility = 'normal'
|
let g:neosolarized_vertSplitBgTrans = 0
|
||||||
let g:neosolarized_vertSplitBgTrans = 0
|
let g:neosolarized_bold = 1
|
||||||
let g:neosolarized_bold = 1
|
let g:neosolarized_underline = 1
|
||||||
let g:neosolarized_underline = 1
|
let g:neosolarized_italic = 1
|
||||||
let g:neosolarized_italic = 1
|
set background=dark
|
||||||
set background=dark
|
colorscheme NeoSolarized
|
||||||
colorscheme NeoSolarized
|
|
||||||
endif
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
" ===========================
|
" ===========================
|
||||||
|
Loading…
Reference in New Issue
Block a user