diff --git a/files/default/bookworm/etc/vim/vimrc b/files/default/bookworm/etc/vim/vimrc deleted file mode 100644 index 21b7c1c4b..000000000 --- a/files/default/bookworm/etc/vim/vimrc +++ /dev/null @@ -1,62 +0,0 @@ -" $VIMRUNTIME refers to the versioned system directory where Vim stores its -" system runtime files -- /usr/share/vim/vim. -" -" Vim will load $VIMRUNTIME/defaults.vim if the user does not have a vimrc. -" This happens after /etc/vim/vimrc(.local) are loaded, so it will override -" any settings in these files. -" -" If you don't want that to happen, uncomment the below line to prevent -" defaults.vim from being loaded. -" let g:skip_defaults_vim = 1 -" -" If you would rather _use_ default.vim's settings, but have the system or -" user vimrc override its settings, then uncomment the line below. -" source $VIMRUNTIME/defaults.vim - -" All Debian-specific settings are defined in $VIMRUNTIME/debian.vim and -" sourced by the call to :runtime you can find below. If you wish to change -" any of those settings, you should do it in this file or -" /etc/vim/vimrc.local, since debian.vim will be overwritten everytime an -" upgrade of the vim packages is performed. It is recommended to make changes -" after sourcing debian.vim so your settings take precedence. - -runtime! debian.vim - -" Uncomment the next line to make Vim more Vi-compatible -" NOTE: debian.vim sets 'nocompatible'. Setting 'compatible' changes -" numerous options, so any other options should be set AFTER changing -" 'compatible'. -"set compatible - -" Vim5 and later versions support syntax highlighting. Uncommenting the next -" line enables syntax highlighting by default. -"syntax on - -" If using a dark background within the editing area and syntax highlighting -" turn on this option as well -"set background=dark - -" Uncomment the following to have Vim jump to the last position when -" reopening a file -"au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif - -" Uncomment the following to have Vim load indentation rules and plugins -" according to the detected filetype. -"filetype plugin indent on - -" The following are commented out as they cause vim to behave a lot -" differently from regular Vi. They are highly recommended though. -"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 -endif - diff --git a/files/default/bullseye/etc/vim/vimrc b/files/default/bullseye/etc/vim/vimrc deleted file mode 100644 index 1e39c0395..000000000 --- a/files/default/bullseye/etc/vim/vimrc +++ /dev/null @@ -1,53 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/debian.vim and sourced by -" the call to :runtime you can find below. If you wish to change any of those -" settings, you should do it in this file (/etc/vim/vimrc), since debian.vim -" will be overwritten everytime an upgrade of the vim packages is performed. -" It is recommended to make changes after sourcing debian.vim since it alters -" the value of the 'compatible' option. - -runtime! debian.vim - -" Vim will load $VIMRUNTIME/defaults.vim if the user does not have a vimrc. -" This happens after /etc/vim/vimrc(.local) are loaded, so it will override -" any settings in these files. -" If you don't want that to happen, uncomment the below line to prevent -" defaults.vim from being loaded. -" let g:skip_defaults_vim = 1 - -" Uncomment the next line to make Vim more Vi-compatible -" NOTE: debian.vim sets 'nocompatible'. Setting 'compatible' changes numerous -" options, so any other options should be set AFTER setting 'compatible'. -"set compatible - -" Vim5 and later versions support syntax highlighting. Uncommenting the next -" line enables syntax highlighting by default. -"syntax on - -" If using a dark background within the editing area and syntax highlighting -" turn on this option as well -"set background=dark - -" Uncomment the following to have Vim jump to the last position when -" reopening a file -"au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif - -" Uncomment the following to have Vim load indentation rules and plugins -" according to the detected filetype. -"filetype plugin indent on - -" The following are commented out as they cause vim to behave a lot -" differently from regular Vi. They are highly recommended though. -"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 -endif - diff --git a/files/default/jammy/etc/vim/vimrc b/files/default/jammy/etc/vim/vimrc deleted file mode 100644 index 1fcd4d7fe..000000000 --- a/files/default/jammy/etc/vim/vimrc +++ /dev/null @@ -1,55 +0,0 @@ -" All system-wide defaults are set in $VIMRUNTIME/debian.vim and sourced by -" the call to :runtime you can find below. If you wish to change any of those -" settings, you should do it in this file (/etc/vim/vimrc), since debian.vim -" will be overwritten everytime an upgrade of the vim packages is performed. -" It is recommended to make changes after sourcing debian.vim since it alters -" the value of the 'compatible' option. - -runtime! debian.vim - -" Vim will load $VIMRUNTIME/defaults.vim if the user does not have a vimrc. -" This happens after /etc/vim/vimrc(.local) are loaded, so it will override -" any settings in these files. -" If you don't want that to happen, uncomment the below line to prevent -" defaults.vim from being loaded. -" let g:skip_defaults_vim = 1 - -" Uncomment the next line to make Vim more Vi-compatible -" NOTE: debian.vim sets 'nocompatible'. Setting 'compatible' changes numerous -" options, so any other options should be set AFTER setting 'compatible'. -"set compatible - -" Vim5 and later versions support syntax highlighting. Uncommenting the next -" line enables syntax highlighting by default. -if has("syntax") - syntax on -endif - -" If using a dark background within the editing area and syntax highlighting -" turn on this option as well -"set background=dark - -" Uncomment the following to have Vim jump to the last position when -" reopening a file -"au BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g'\"" | endif - -" Uncomment the following to have Vim load indentation rules and plugins -" according to the detected filetype. -"filetype plugin indent on - -" The following are commented out as they cause vim to behave a lot -" differently from regular Vi. They are highly recommended though. -"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 -endif - diff --git a/manifests/profile/vim.pp b/manifests/profile/vim.pp index e77177641..23fc05831 100644 --- a/manifests/profile/vim.pp +++ b/manifests/profile/vim.pp @@ -11,14 +11,6 @@ class nebula::profile::vim { package { 'vim': } - # Replace default vimrc - # This is only here to eliminate our previous customizations - # Remove after December 2024 - file { '/etc/vim/vimrc': - source => "puppet:///modules/nebula/default/${facts['os']['distro']['codename']}/etc/vim/vimrc", - require => Package['vim'], - } - file { '/etc/vim/vimrc.local': content => template('nebula/profile/vim/vimrc.local.erb'), require => Package['vim'],