diff options
Diffstat (limited to 'dotfiles/.config/nvim/init.vim')
| -rw-r--r-- | dotfiles/.config/nvim/init.vim | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim index 95d7a63..4f736e8 100644 --- a/dotfiles/.config/nvim/init.vim +++ b/dotfiles/.config/nvim/init.vim @@ -28,13 +28,12 @@ call plug#begin('~/.local/share/nvim/site/plugged') Plug 'tpope/vim-fugitive' Plug 'mmarchini/bpftrace.vim' Plug 'junkblocker/git-time-lapse' + Plug 'tikhomirov/vim-glsl' + Plug 'aklt/plantuml-syntax' if has('nvim-0.6') Plug 'neovim/nvim-lspconfig' Plug 'ojroques/nvim-lspfuzzy' endif - if has('nvim-0.9') - Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'} - endif call plug#end() " Some basics: @@ -70,6 +69,7 @@ call plug#end() set background=light endfunction map <F10> :call ChangeBG()<CR> + autocmd Signal SIGUSR1 call ChangeBG() let g:markdown_fenced_languages = ['c', 'go', 'sh', 'bash=sh', 'python', 'html', 'css', 'javascript'] " Set screen title @@ -87,7 +87,7 @@ call plug#end() endfunction function! StatuslineGit() let l:branchname = GitBranch() - return strlen(l:branchname) > 0?' '.l:branchname.' ':'' + return strlen(l:branchname) > 0?' '.l:branchname.' ':'' endfunction " git-messenger settings @@ -98,17 +98,17 @@ call plug#end() hi! link diffWordsAdded DiffText hi! link diffWordsRemoved DiffText -" Statusline +" Statusline FIXME: let laststatus=2 - set statusline= + " set statusline= set statusline+=%#SignColumn# set statusline+=%{StatuslineGit()} set statusline+=%#StatusLine# - set statusline+=%< - set statusline+=\ %f%r%m - set statusline+=%= - set statusline+=\ %l/%L,%c%V - set statusline+=\ + " set statusline+=%< + " set statusline+=\ %f%r%m + " set statusline+=%= + " set statusline+=\ %l/%L,%c%V + " set statusline+=\ set statusline+=%#StatusLineNC# set statusline+=\ %Y set statusline+=\ %{&fileencoding?&fileencoding:&encoding} @@ -276,9 +276,6 @@ call plug#end() " Treesitter if has('nvim-0.9') - " XXX: neovim's built-in C et al treesitter parsers are better, although - " not ideal either. - lua require('nvim-treesitter.configs').setup{ ensure_installed = { "go", "rust", "python", "lua", "comment" }, highlight = { enable = true, disable = { "c", "cpp", "vim", "make" } }} set foldmethod=expr set foldexpr=nvim_treesitter#foldexpr() endif @@ -295,11 +292,13 @@ call plug#end() " MFing neovim overrding my omnifunc with whatever ccomplete is autocmd FileType c,ch,header,cpp setlocal omnifunc=v:lua.vim.lsp.omnifunc fdm=syntax " No, Rust, spaces is not superior to tabs, 100 lines is too much - autocmd FileType rust, meson setlocal noet ci pi sts=0 ts=4 sw=4 tw=80 + autocmd FileType rust,meson setlocal noet ci pi sts=0 ts=4 sw=4 tw=80 autocmd FileType mail setlocal spell spelllang=en_us,es,ru tw=72 | \ let b:SuperTabContextDefaultCompletionType = "<c-p>" autocmd FileType text,tex,markdown,html,rst setlocal spell spelllang=en_us,es,ru tw=80 | \ let b:SuperTabContextDefaultCompletionType = "<c-p>" + " Having this on is a retarded default + let g:zig_fmt_autosave = 0 " C indentation rules set cino=:0l1 |