aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Löthberg <johannes@kyriasis.com>2018-07-19 14:43:53 +0200
committerJohannes Löthberg <johannes@kyriasis.com>2018-07-19 14:43:53 +0200
commit6727d0dbd55f5f15584b08b4b588f0436edc2ebd (patch)
tree61d6224ea393ba2fed9420282d97587069c2b29e
parentb9aa50816bef14a45083fd2cc4a789bb65d002da (diff)
downloaddotfiles-6727d0dbd55f5f15584b08b4b588f0436edc2ebd.tar.xz
nvim: Reorganize things
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com>
-rw-r--r--nvim/init.vim52
1 files changed, 20 insertions, 32 deletions
diff --git a/nvim/init.vim b/nvim/init.vim
index 6a1d295..2a81784 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -4,9 +4,13 @@
call plug#begin(expand('$XDG_CONFIG_HOME/nvim/plugs'))
-Plug 'chriskempson/base16-vim' " Base16 colorschemes
-Plug 'itchyny/lightline.vim' " Modeline replacement
+" Base16 colorschemes
+Plug 'chriskempson/base16-vim'
+" Modeline replacement
+Plug 'itchyny/lightline.vim'
+
+" Better syntax highlighting
Plug 'rust-lang/rust.vim'
Plug 'tpope/vim-git'
@@ -27,14 +31,6 @@ let g:lightline = {
"""
-" Builtin things
-"
-
-" List of vim syntaxes to highlight in rST code blocks
-let g:rst_syntax_code_list = ['vim', 'c', 'cpp', 'python', 'sh']
-
-
-"""
" NVim settings
"
@@ -79,6 +75,20 @@ autocmd InsertLeave * match ExtraWhitespace /\s\+$/
autocmd BufWinLeave * call clearmatches()
+"""
+" Filetypes
+"
+augroup filetypedetect
+ autocmd BufRead,BufNewFile *mutt-* setfiletype mail
+ autocmd BufRead,BufNewFile *.h setfiletype c
+augroup END
+
+
+" Horrible hack to work-around weird corrupted lines on window resize
+" https://github.com/neovim/neovim/issues/7861
+autocmd VimResized * redraw!
+
+
"""
" Mappings
@@ -97,30 +107,8 @@ vmap <C-k> gk
nmap <C-j> gj
nmap <C-k> gk
-
-"""
-" CtrlP
-"
-
-let g:ctrlp_extensions = ['tag', 'buffertag', 'dir', 'undo', 'line',
- \ 'changes', 'mixed', 'bookmarkdir']
-
noremap <silent> <Leader>pf :Denite file_rec<CR>
noremap <silent> <Leader>pm :Denite file_mru<CR>
noremap <silent> <Leader>pb :Denite buffer<CR>
noremap <silent> <Leader>px :Denite buffer file_mru file_rec<CR>
noremap <silent> <Leader>pg :Denite grep<CR>
-
-
-"""
-" Filetypes
-"
-augroup filetypedetect
- autocmd BufRead,BufNewFile *mutt-* setfiletype mail
- autocmd BufRead,BufNewFile *.h setfiletype c
-augroup END
-
-
-" Horrible hack to work-around weird corrupted lines on window resize
-" https://github.com/neovim/neovim/issues/7861
-autocmd VimResized * redraw!