From f58186fa87076190b96b5a0a4c0bc3ae63de691f Mon Sep 17 00:00:00 2001 From: CramMK Date: Fri, 17 Jul 2020 23:56:40 +0200 Subject: [PATCH] Add nvim --- config.yaml | 10 ++++++++++ dotfiles/config/nvim/init.vim | 3 +++ dotfiles/vimrc | 30 ++++++++++++++++++------------ 3 files changed, 31 insertions(+), 12 deletions(-) create mode 100644 dotfiles/config/nvim/init.vim diff --git a/config.yaml b/config.yaml index 17d4fdf..780095a 100644 --- a/config.yaml +++ b/config.yaml @@ -65,6 +65,9 @@ dotfiles: f_alacritty: src: config/alacritty/alacritty.yml dst: ~/.config/alacritty/alacritty.yml + f_nvim: + src: config/nvim/init.vim + dst: ~/.config/nvim/init.vim profiles: laptop: @@ -72,6 +75,7 @@ profiles: - zsh - zshhighlighting - vim + - nvim - i3 - x11 - font @@ -156,3 +160,9 @@ profiles: alacritty: dotfiles: - f_alacritty + nvim: + dotfiles: + - f_nvim + nvim: + dotfiles: + - f_nvim diff --git a/dotfiles/config/nvim/init.vim b/dotfiles/config/nvim/init.vim new file mode 100644 index 0000000..b42c8d9 --- /dev/null +++ b/dotfiles/config/nvim/init.vim @@ -0,0 +1,3 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath=&runtimepath +source ~/.vimrc diff --git a/dotfiles/vimrc b/dotfiles/vimrc index f444b93..a91c34b 100644 --- a/dotfiles/vimrc +++ b/dotfiles/vimrc @@ -65,6 +65,13 @@ let g:nord_bold = 0 let g:nord_italic = 1 let g:nord_underline = 1 +"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" +" autocomplete +if has('nvim') + Plugin 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } +endif +let g:deoplete#enable_at_startup = 1 + """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""" call vundle#end() filetype plugin indent on @@ -90,20 +97,19 @@ set mouse=c set undolevels=1337 set backspace=indent,eol,start set wildmenu " autocomplete :e -"set lazyredraw " redraw only when necessary " ------------------------------------- Indents & Whitespaces ------------------ -set tabstop=4 " how many spaces are a tab when opening a file -set softtabstop=4 " how many spaces get placed instead of a tab -set shiftwidth=4 " width of indents (<,>) -set expandtab " tabs are spaces -set smartindent - -" File specific indents -autocmd FileType yaml setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab -autocmd FileType tex setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab -autocmd FileType rust setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab -autocmd FileType perl setlocal tabstop=8 shiftwidth=8 softtabstop=8 noexpandtab +"set tabstop=4 " how many spaces are a tab when opening a file +"set softtabstop=4 " how many spaces get placed instead of a tab +"set shiftwidth=4 " width of indents (<,>) +"set expandtab " tabs are spaces +"set smartindent +" +"" File specific indents +"autocmd FileType yaml setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab +"autocmd FileType tex setlocal tabstop=2 shiftwidth=2 softtabstop=2 expandtab +"autocmd FileType rust setlocal tabstop=4 shiftwidth=4 softtabstop=4 expandtab +"autocmd FileType perl setlocal tabstop=8 shiftwidth=8 softtabstop=8 noexpandtab set list set listchars=tab:»\ ,extends:›,precedes:‹,nbsp:·,trail:·