diff --git a/nvim/init.vim b/nvim/init.vim index 8843806..82d12df 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -38,6 +38,7 @@ Plug 'christoomey/vim-conflicted' " For tmux yank Plug 'vim-utils/vim-husk' " Tags +Plug 'steffanc/cscopemaps.vim' Plug 'ludovicchabant/vim-gutentags' " GDB Plug 'sakhnik/nvim-gdb', { 'do': ':!./install.sh \| UpdateRemotePlugins' } @@ -55,13 +56,16 @@ Plug 'autozimu/LanguageClient-neovim' , { \ 'branch' : 'next', \ 'do' : './install.sh' \ } +" For Nix +Plug 'LnL7/vim-nix', { 'for': 'nix' } " For autocompletion Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " Autocomplete for Python Plug 'zchee/deoplete-jedi' " Autocomplete for Rust Plug 'sebastianmarkow/deoplete-rust' -Plug 'rust-lang/rust.vim' +Plug 'cespare/vim-toml', { 'for': 'rust' } +Plug 'rust-lang/rust.vim', { 'for': 'rust' } " Erlang Support Plug 'vim-erlang/vim-erlang-tags' Plug 'vim-erlang/vim-erlang-runtime' @@ -74,6 +78,7 @@ Plug 'tpope/vim-eunuch' Plug 'jeetsukumaran/vim-buffergator' Plug 'vim-utils/vim-man' Plug 'unblevable/quick-scope' +Plug 'igankevich/mesonic' " Initialize plugin system call plug#end() @@ -309,7 +314,7 @@ let g:haskell_enable_typeroles = 1 " to enable highlighting of type roles let g:haskell_enable_static_pointers = 1 " to enable highlighting of `static` let g:haskell_backpack = 1 " to enable highlighting of backpack keywords -let g:haskell_classic_highlighting = 1 +let g:haskell_classic_highlighting = 0 let g:haskell_indent_if = 3 let g:haskell_indent_case = 2 let g:haskell_indent_let = 4 @@ -381,3 +386,8 @@ let g:gutentags_ctags_extra_args = [ \ '--tag-relative=yes', \ '--fields=+ailmnS', \ ] + +" Default indentations +autocmd BufRead,BufNewFile */gst-*/*.[ch] set et sw=2 +autocmd BufRead,BufNewFile */gstreamer-*/*.[ch] set et sw=2 +autocmd BufRead,BufNewFile */pulseaudio/*.[ch] set et sw=4 tw=128