From 542c4109eb6a3abb12bbe7144902425a23aaac21 Mon Sep 17 00:00:00 2001 From: Mikaela Suomalainen Date: Thu, 11 Oct 2018 13:11:06 +0300 Subject: [PATCH] Heavily touch vimrc, add init.vim for Neovim --- conf/init.vim | 6 +++ install | 2 + rc/vimrc | 112 +++++++++++++++++--------------------------------- 3 files changed, 46 insertions(+), 74 deletions(-) create mode 100644 conf/init.vim diff --git a/conf/init.vim b/conf/init.vim new file mode 100644 index 00000000..40477b98 --- /dev/null +++ b/conf/init.vim @@ -0,0 +1,6 @@ +" This is neovim config file + +set runtimepath^=~/.vim runtimepath+=~/.vim/after + let &packpath = &runtimepath +source ~/.vimrc + diff --git a/install b/install index e26b5f4d..26ce6172 100755 --- a/install +++ b/install @@ -10,6 +10,8 @@ cat rc/zshrc > ~/.zshrc cat rc/profile > ~/.profile cat conf/gitconfig > ~/.gitconfig cat rc/vimrc > ~/.vimrc +mkdir -p ~/.config/nvim/ +cat conf/init.vim > ~/.config/nvim/init.vim cat conf/makepkg.conf > ~/.makepkg.conf if [ ! -f ~/.oidentd.conf ]; then cat conf/oidentd.conf > ~/.oidentd.conf diff --git a/rc/vimrc b/rc/vimrc index fa102b29..dd4f9a0c 100644 --- a/rc/vimrc +++ b/rc/vimrc @@ -1,58 +1,37 @@ " I probably don't need to have Vi compatibility. set nocompatible -" Copied from /usr/local/vim/vimrc of Debian. - " Show syntax colours syntax on -set showcmd " Show (partial) command in status line. -set showmatch " Show matching brackets. -set ignorecase " Do case insensitive matching -set smartcase " Do smart case matching -"set incsearch " Incremental search -set autowrite " Automatically save before commands like :next and :make -set hidden " Hide buffers when they are abandoned -"set mouse=a " Enable mouse usage (all modes) +set showcmd " Show (partial) command in status line. +set showmatch " Show matching brackets. +set ignorecase " Do case insensitive matching +set smartcase " Do smart case matching +"set incsearch " Incremental search +set autowrite " Automatically save before commands like :next and :make +set hidden " Hide buffers when they are abandoned +"set mouse=a " Enable mouse usage (all modes) " Source a global configuration file if available if filereadable("/etc/vim/vimrc.local") - source /etc/vim/vimrc.local + source /etc/vim/vimrc.local endif -" end of copied from /usr/local/vim/vimrc +set number " Show line numbers. -" Copied from nyuszika7h http://nyuszika7h.dyndns.org/~nyuszika7h/.vimrc - -set number " Show line numbers. - -set ruler " Show the line and column number of the cursor position, - " separated by a comma. - -set background=dark " When set to "dark", Vim will try to use colors that look - " good on a dark background. When set to "light", Vim will - " try to use colors that look good on a light background. - " Any other value is illegal. - -" end of copied from nyuszika7h +set ruler " Show the line and column number of the cursor position, + " separated by a comma. +set background=dark "Use modelines! set modeline - -"end of copied fron vimwiki. - -" copied from http://www.linuxquestions.org/questions/suse-novell-60/how-to-make-a-tab-is-4-spaces-width-in-vim-355658/ - -set tabstop=4 -set shiftwidth=4 -set expandtab +set tabstop=4 "four spaces is likely a tab +"set shiftwidth=4 +set noexpandtab set autoindent -" end of copied fron linuxquestions.org - -" Copied from whttp://items.sjbach.com/319/configuring-vim-right - " Longer history set history=1000 @@ -60,19 +39,20 @@ set history=1000 runtime macros/matchit.vim " Make tab filler useful. +" INVESTIGATE WHAT THIS ACTUALLY DOES? set wildmenu set wildmode=list:longest " Flash, do not beep! set visualbell -" End of copied from http://items.sjbach.com/319/configuring-vim-right " gvim has light background if has('gui_running') - set background=light + set background=light endif -" Show hidden characters via http://www.perturb.org/display/679_Make_Vim_show_hidden_characters.html +" Show hidden characters via +" http://www.perturb.org/display/679_Make_Vim_show_hidden_characters.html set invlist "Prefer to UNIX line endings, but understand DOS too. @@ -82,52 +62,36 @@ set fileformats=unix,dos set encoding=utf-8 set fileencoding=utf-8 -" Remove BOMs. They broke things yesterday nd now they wasted my time -" at school! via http://techwelkin.com/how-to-remove-byte-order-mark-bom-characters +" Remove BOMs. They broke things yesterday and now they wasted my time +" at school! +" via http://techwelkin.com/how-to-remove-byte-order-mark-bom-characters set nobomb -" Copied from https://github.com/ProgVal/misc/blob/master/dotfiles/.vimrc -set autoindent -set softtabstop=4 filetype plugin indent on " Return to last edit position when opening files (You want this!) autocmd BufReadPost * - \ if line("'\"") > 0 && line("'\"") <= line("$") | - \ exe "normal! g`\"" | - \ endif -" End of copied from https://raw.githubusercontent.com/ProgVal/misc/master/dotfiles/.vimrc - -" If we have tabs, remove them -"if has("autocmd") -" au BufReadPost * if &modifiable | retab | endif -"endif + \ if line("'\"") > 0 && line("'\"") <= line("$") | + \ exe "normal! g`\"" | + \ endif " dos2unix ^M copied from http://stackoverflow.com/a/5361702/1675649 fun! Dos2unixFunction() - let _s=@/ - let l = line(".") - let c = col(".") - try - set ff=unix - w! - "%s/\%x0d$//e - catch /E32:/ - echo "Sorry, the file is not saved." - endtry - let @/=_s - call cursor(l, c) + let _s=@/ + let l = line(".") + let c = col(".") + try + set ff=unix + w! + "%s/\%x0d$//e + catch /E32:/ + echo "Sorry, the file is not saved." + endtry + let @/=_s + call cursor(l, c) endfun com! Dos2Unix keepjumps call Dos2unixFunction() au BufReadPost * keepjumps call Dos2unixFunction() -" Copied from Edelwin: https://gist.github.com/Edelwin/ca9a819e5509f1ede2d7 -iab #i #include -iab #z #!/usr/bin/env zsh -iab #p #!/usr/bin/env python3 -iab #r #!/usr/bin/env ruby -" end of copied from Edelwin -iab #b #!/usr/bin/env bash - " Highlight all search results set hlsearch