From eed53f3305af0a1e059d0fbd79a3c85b17894eec Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 3 Jul 2018 13:52:15 +1200 Subject: Handle system-specific undos with system.vim file --- Makefile | 10 ++++------ vim/config/centos.vim | 29 ----------------------------- vim/config/debian.vim | 21 --------------------- vim/system/centos.vim | 29 +++++++++++++++++++++++++++++ vim/system/debian.vim | 21 +++++++++++++++++++++ vim/vimrc | 3 +++ 6 files changed, 57 insertions(+), 56 deletions(-) delete mode 100644 vim/config/centos.vim delete mode 100644 vim/config/debian.vim create mode 100644 vim/system/centos.vim create mode 100644 vim/system/debian.vim diff --git a/Makefile b/Makefile index e864a7ad..9f5c768e 100644 --- a/Makefile +++ b/Makefile @@ -548,14 +548,12 @@ install-vim-compiler: cp -p -- vim/compiler/*.vim $(VIMDIR)/compiler install-vim-config: - mkdir -p -- $(VIMDIR)/config cp -p -- vim/vimrc $(VIMRC) if [ -e /etc/debian_version ] ; then \ - cp -p -- vim/config/debian.vim $(VIMDIR)/config ; \ - fi - if [ -e /etc/centos-release ] ; then \ - cp -p -- vim/config/centos.vim $(VIMDIR)/config ; \ - fi + cp -p -- vim/system/debian.vim $(VIMDIR)/system.vim ; \ + elif [ -e /etc/centos-release ] ; then \ + cp -p -- vim/system/centos.vim $(VIMDIR)/system.vim ; \ + fi install-vim-filetype: cp -p -- vim/filetype.vim vim/scripts.vim $(VIMDIR) diff --git a/vim/config/centos.vim b/vim/config/centos.vim deleted file mode 100644 index 26289bf8..00000000 --- a/vim/config/centos.vim +++ /dev/null @@ -1,29 +0,0 @@ -" Revert settings that CentOS might have touched -if $VIM !=# '/usr/share/vim' || !filereadable('/etc/centos-release') - finish -endif - -" Set options back to appropriate defaults -set history& -if has('cmdline_info') - set ruler& -endif -if has('cscope') - set csprg& cst& csto& csverb& - silent! cs kill -endif -if has('gui') - set guicursor& -endif -if has('viminfo') - set viminfo& -endif - -" Restore terminal settings to reflect terminfo -set t_Co& t_Sf& t_Sb& - -" Delete autocmd groups -augroup redhat - autocmd! -augroup END -augroup! redhat diff --git a/vim/config/debian.vim b/vim/config/debian.vim deleted file mode 100644 index 125a9240..00000000 --- a/vim/config/debian.vim +++ /dev/null @@ -1,21 +0,0 @@ -" Revert settings that Debian might have touched -if $VIM !=# '/usr/share/vim' || !filereadable('/etc/debian_version') - finish -endif - -" Set options back to appropriate defaults -set history& -set suffixes& -if has('cmdline_info') - set ruler& -endif -if has('printoptions') - set printoptions& -endif - -" Restore terminal settings to reflect terminfo -set t_Co& t_Sf& t_Sb& - -" Remove addons directories from 'runtimepath' if present -silent! set runtimepath-=/var/lib/vim/addons -silent! set runtimepath-=/var/lib/vim/addons/after diff --git a/vim/system/centos.vim b/vim/system/centos.vim new file mode 100644 index 00000000..26289bf8 --- /dev/null +++ b/vim/system/centos.vim @@ -0,0 +1,29 @@ +" Revert settings that CentOS might have touched +if $VIM !=# '/usr/share/vim' || !filereadable('/etc/centos-release') + finish +endif + +" Set options back to appropriate defaults +set history& +if has('cmdline_info') + set ruler& +endif +if has('cscope') + set csprg& cst& csto& csverb& + silent! cs kill +endif +if has('gui') + set guicursor& +endif +if has('viminfo') + set viminfo& +endif + +" Restore terminal settings to reflect terminfo +set t_Co& t_Sf& t_Sb& + +" Delete autocmd groups +augroup redhat + autocmd! +augroup END +augroup! redhat diff --git a/vim/system/debian.vim b/vim/system/debian.vim new file mode 100644 index 00000000..125a9240 --- /dev/null +++ b/vim/system/debian.vim @@ -0,0 +1,21 @@ +" Revert settings that Debian might have touched +if $VIM !=# '/usr/share/vim' || !filereadable('/etc/debian_version') + finish +endif + +" Set options back to appropriate defaults +set history& +set suffixes& +if has('cmdline_info') + set ruler& +endif +if has('printoptions') + set printoptions& +endif + +" Restore terminal settings to reflect terminfo +set t_Co& t_Sf& t_Sb& + +" Remove addons directories from 'runtimepath' if present +silent! set runtimepath-=/var/lib/vim/addons +silent! set runtimepath-=/var/lib/vim/addons/after diff --git a/vim/vimrc b/vim/vimrc index 5f3e06cf..b1fbbbd4 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -4,6 +4,9 @@ " own without the accompanying plugins to which it refers near its end, but " you'll get errors for some of the leader maps. +" Undo anything the operating system's vimrc may have broken +runtime system.vim + " Load filetype settings, plugins, and maps if has('autocmd') let g:maplocalleader = '_' -- cgit v1.2.3 From 71f555a66994dfb7e363820ab81735433f113870 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 3 Jul 2018 13:52:26 +1200 Subject: Convert space indents to tabs in Makefile --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 9f5c768e..03f2740b 100644 --- a/Makefile +++ b/Makefile @@ -432,8 +432,8 @@ install-ncmcpp: install-mpd install-neovim: make install-vim \ - VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \ - VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim + VIMDIR=$${XDG_CONFIG_HOME:-"$$HOME"/.config}/nvim \ + VIMRC=$${XDF_CONFIG_HOME:="$$HOME"/.config}/init.vim install-newsboat: mkdir -p -- $(HOME)/.config/newsboat $(HOME)/.local/share/newsboat @@ -536,7 +536,7 @@ install-vim-autoload: install-vim-bundle: install-vim-config find vim/bundle/*/* \ - -type d -exec sh -c \ + -type d -exec sh -c \ 'mkdir -p -- $(VIMDIR)/"$${1#vim/bundle/*/}"' _ {} \; find vim/bundle/*/*/* \ -type f -exec sh -c \ -- cgit v1.2.3 From fe15bab548a10dc8d1395e23927f775b11cc1cc2 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Tue, 3 Jul 2018 13:54:11 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 4c010c6f..04165f64 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v1.18.0 -Mon Jul 2 10:53:44 UTC 2018 +tejr dotfiles v1.19.0 +Tue Jul 3 01:53:55 UTC 2018 -- cgit v1.2.3