summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdrian Kummerlaender2019-03-04 20:35:55 +0100
committerAdrian Kummerlaender2019-03-04 20:35:55 +0100
commit39e5cba8ad350c1ecee66ee18093f20146a60bba (patch)
tree56dddaf0c9b1b1f74402f874ad5213776a67ca69
parente8d3e7dbd9248fbafab466b379adbc6d298d3db4 (diff)
downloadpkgs-39e5cba8ad350c1ecee66ee18093f20146a60bba.tar
pkgs-39e5cba8ad350c1ecee66ee18093f20146a60bba.tar.gz
pkgs-39e5cba8ad350c1ecee66ee18093f20146a60bba.tar.bz2
pkgs-39e5cba8ad350c1ecee66ee18093f20146a60bba.tar.xz
pkgs-39e5cba8ad350c1ecee66ee18093f20146a60bba.zip
Use Denite for prettier symbol search
Seldomly used, performance doesn't matter as much. Other narrowing searches are still performed by fzf.
-rw-r--r--pkgs/custom-neovim/asset/rc.vim10
-rw-r--r--pkgs/custom-neovim/default.nix1
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/custom-neovim/asset/rc.vim b/pkgs/custom-neovim/asset/rc.vim
index f1155f1..822ac87 100644
--- a/pkgs/custom-neovim/asset/rc.vim
+++ b/pkgs/custom-neovim/asset/rc.vim
@@ -37,6 +37,7 @@ let mapleader=","
map <leader>s :let @/=""<CR>
map <leader>c zz
map <leader>d <c-]>
+map <leader>h q:
nmap <backspace> :e#<CR>
nmap f za
@@ -49,6 +50,7 @@ autocmd InsertEnter * :setlocal nohlsearch
autocmd InsertLeave * :setlocal hlsearch
autocmd FileType scheme setlocal shiftwidth=2 tabstop=2 expandtab
+autocmd FileType nix setlocal shiftwidth=2 tabstop=2 expandtab
autocmd FileType lisp setlocal shiftwidth=2 tabstop=2 expandtab
autocmd FileType racket setlocal shiftwidth=2 tabstop=2 expandtab
autocmd FileType haskell setlocal shiftwidth=2 tabstop=4 softtabstop=2 shiftround expandtab
@@ -127,9 +129,7 @@ nmap <S-w> <Leader>w
" spinning up a language client only makes
" sense if such a client is available
if executable('cquery')
- let g:LanguageClient_serverCommands = { 'cpp': [
-\ 'cquery', '--init={"cacheDirectory":"/tmp/cquery/", "completion": {"filterAndSort": false}}'
-\ ] }
+ let g:LanguageClient_serverCommands = { 'cpp': [ 'cquery' ] }
let g:LanguageClient_hoverPreview = "Never"
set completefunc=LanguageClient#complete
@@ -145,6 +145,6 @@ if executable('cquery')
nnoremap <silent> gt :call LanguageClient#textDocument_typeDefinition()<CR>
nnoremap <silent> gi :call LanguageClient#textDocument_implementation()<CR>
- nmap <c-t> :call LanguageClient#workspace_symbol()<CR>
- nmap <a-t> :call LanguageClient#textDocument_documentSymbol()<CR>
+ nmap <c-t> :Denite workspaceSymbol<CR>
+ nmap <a-t> :Denite documentSymbol<CR>
endif
diff --git a/pkgs/custom-neovim/default.nix b/pkgs/custom-neovim/default.nix
index 1d6b4c3..ca1fc75 100644
--- a/pkgs/custom-neovim/default.nix
+++ b/pkgs/custom-neovim/default.nix
@@ -19,6 +19,7 @@ in pkgs.neovim.override {
fzf-vim
LanguageClient-neovim
deoplete-nvim
+ denite
# load project specific config
vim-localvimrc