This commit is contained in:
Julian Ospald 2020-12-04 23:17:32 +01:00
parent 005a3f1c1f
commit b8e13b4e34
No known key found for this signature in database
GPG Key ID: 511B62C09D50CD28
2 changed files with 50 additions and 16 deletions

View File

@ -3,6 +3,12 @@ let g:mapleader = ' '
inoremap <C-u> <Esc>
nnoremap <C-,> :tabprevious<CR>
nnoremap <C-.> :tabnext<CR>
noremap <C-PageUp> gT
noremap <C-PageDown> gt
"
nnoremap <Leader>tk <C-w><C-]><C-w>T
@ -271,7 +277,7 @@ nnoremap <S-C> <c-v>
" write
noremap <C-s> :w<CR>
inoremap <C-s> <C-O>:w<CR>
inoremap <C-s> <Esc>:w<CR>
" exit
noremap <C-q> :qa!<CR>
@ -335,9 +341,10 @@ nmap <C-F4> :YcmCompleter GoTo<CR>:wincmd o<CR>
nnoremap <leader>ag :Clap grep ++query=<cword><CR>
" nnoremap <silent> <leader>tg :Clap proj_tags ++query=<cword><CR>
nmap <C-f> :Clap files<CR>
nmap <F2> :Clap tags<CR>
nmap <F1> :Clap tags<CR>
nmap <F2> :Clap proj_tags<CR>
nmap <C-b> :Clap buffers<CR>
nnoremap <silent> <leader>tb :Clap tags ++query=<cword><CR>
nnoremap <silent> <leader>tb :Clap generated_tags ++query=<cword><CR>
nnoremap <silent> <leader>tg :tag <C-R>=expand("<cword>")<CR><CR>
nnoremap <silent> <leader>tp :ptag <C-R>=expand("<cword>")<CR><CR>

View File

@ -126,9 +126,39 @@ repo = 'kshenoy/vim-signature'
repo = 'liuchengxu/vim-clap'
build = 'make'
hook_add = '''
command -nargs=* Rag Clap grep ++query=<args>
autocmd Filetype clap_input inoremap <silent> <buffer> <kPageDown> <C-R>=clap#navigation#scroll('down')<CR>
autocmd Filetype clap_input inoremap <silent> <buffer> <kPageUp> <C-R>=clap#navigation#scroll('up')<CR>
autocmd Filetype clap_input nnoremap <silent> <buffer> <kPageDown> <C-R>=clap#navigation#scroll('down')<CR>
autocmd Filetype clap_input nnoremap <silent> <buffer> <kPageUp> <C-R>=clap#navigation#scroll('up')<CR>
let g:clap_popup_move_manager = {
\ "\<kPageUp>": "\<PageUp>",
\ "\<kPageDown>": "\<PageDown>",
\ }
let g:clap_layout = {'relative': 'editor', 'width': '95%', 'height': '33%', 'row': '33%', 'col': '5%'}
let g:clap_use_pure_python = 1
function! MultiGrep(...) abort
let opts = map(copy(a:000), "printf('++query=%s', v:val)")
execute 'Clap grep' join(opts, ' ')
endfunction
command! -nargs=* Rag call MultiGrep(<f-args>)
let g:clap_provider_generated_tags = {
\ 'source': {-> Tags__source()},
\ 'sink': {line -> Tags__sink(line)},
\}
function! Tags__source ()
return flatten(map(tagfiles(), {_, file -> filter(readfile(file), 'stridx(v:val, "!_TAG") != 0')}))
endfunc
function! Tags__sink (line)
" Let vim handle the tag
execute 'tag' split(a:line, '\t')[0]
endfunc
'''
# scm
@ -192,17 +222,14 @@ on_if = '!has("nvim")'
# linting/compilation
[[plugins]]
repo = 'w0rp/ale'
build = 'bash -c "cp -R ~/.vim/ale_linters ."'
repo = 'dense-analysis/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_enabled = 1
let g:ale_haskell_hie_executable = $HOME . '/.ghcup/bin/haskell-language-server-wrapper'
let g:ale_linters = {'haskell':['hie'], 'c':[]}
let g:ale_linters_explicit = 1
let g:ale_haskell_argon_error_level = 14
let g:ale_haskell_argon_warn_level = 10
let g:ale_haskell_argon_info_level = 6
@ -325,7 +352,7 @@ 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_indent_disable = 1
" let g:haskell_enable_quantification = 1
" let g:haskell_enable_recursivedo = 1
" let g:haskell_enable_arrowsyntax = 1
@ -345,7 +372,7 @@ hook_add = '''
[[plugins]]
repo = 'Twinside/vim-hoogle'
on_ft = ['haskell']
hook_add = '''
hook_source = '''
nnoremap <leader>ho :Hoogle<CR>
nnoremap <leader>hc :HoogleClose<CR>
'''
@ -466,7 +493,7 @@ rtp = 'colorschemedegrade'
[[plugins]]
name = 'exheres-syntax'
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'
rtp = 'exheres-syntax-20160116'
rtp = 'exheres-syntax-20160115'
[[plugins]]
name = 'fontzoom'
repo = 'https://gogs.hasufell.de/hasufell/vim-unmanaged.git'