From e28b57ffc029ee6d04e8b52008ffb9bf19364a02 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Sat, 8 Jun 2019 22:23:36 +0000 Subject: [PATCH] [vim] add nvim config --- home/.config/nvim/init.vim | 3 +++ home/.vim/ftdetect/filetypes.vim | 5 +++-- home/.vimrc | 11 ++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 home/.config/nvim/init.vim diff --git a/home/.config/nvim/init.vim b/home/.config/nvim/init.vim new file mode 100644 index 0000000..f182e5b --- /dev/null +++ b/home/.config/nvim/init.vim @@ -0,0 +1,3 @@ +set runtimepath^=~/.vim runtimepath+=~/.vim/after +let &packpath = &runtimepath +source ~/.vimrc diff --git a/home/.vim/ftdetect/filetypes.vim b/home/.vim/ftdetect/filetypes.vim index fc6db82..e2647be 100644 --- a/home/.vim/ftdetect/filetypes.vim +++ b/home/.vim/ftdetect/filetypes.vim @@ -3,8 +3,8 @@ au BufRead,BufNewFile *.scad setfiletype openscad " Set properties autocmd Filetype arduino setlocal ts=2 sw=2 sts=2 expandtab -autocmd Filetype cpp setlocal ts=4 sw=4 sts=4 expandtab autocmd Filetype c setlocal ts=4 sw=4 sts=4 expandtab +autocmd Filetype cpp setlocal ts=4 sw=4 sts=4 expandtab autocmd Filetype css setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype dart setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype dockerfile setlocal ts=4 sw=4 sts=4 expandtab @@ -25,11 +25,12 @@ autocmd Filetype php setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype python setlocal ts=4 sw=4 sts=4 expandtab autocmd Filetype scss setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype sh setlocal ts=4 sw=4 sts=4 expandtab -autocmd Filetype zsh setlocal ts=4 sw=4 sts=4 expandtab autocmd Filetype svg setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype tex setlocal ts=1 sw=1 sts=1 expandtab autocmd Filetype tf setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype toml setlocal ts=2 sw=2 sts=2 expandtab +autocmd Filetype vim setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype vue setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype xml setlocal ts=2 sw=2 sts=2 expandtab autocmd Filetype yaml setlocal ts=2 sw=2 sts=2 expandtab +autocmd Filetype zsh setlocal ts=4 sw=4 sts=4 expandtab diff --git a/home/.vimrc b/home/.vimrc index 1b0e583..b854134 100644 --- a/home/.vimrc +++ b/home/.vimrc @@ -22,11 +22,12 @@ filetype plugin indent on """ END VUNDLE " statusline -python3 from powerline.vim import setup as powerline_setup -python3 powerline_setup() -python3 del powerline_setup -set laststatus=2 " always show powerline - +if !has('nvim') + python3 from powerline.vim import setup as powerline_setup + python3 powerline_setup() + python3 del powerline_setup + set laststatus=2 " always show powerline +endif " line numbers set number