Refactor plugin sets

Rename plugins, plugins-noroot and plugins-noroot-nolowendbox to
plugins-mini, plugins-midi and plugins-full. Rename the config functions
respectively. Should make meaning of the plugin sets more clearer.

Also avoid being smart on loading plugin sets based on uid or config
variables. Instead provide them as plugins-xxx.vim.example and let user
symlink if they shall be loaded.

Also move plugins where reasonable

diff --git a/README.md b/README.md
index 43f7882f5f5e11bdf7e5461016a4233120182982..6f6760be81db5543bfab38cb907606ff83335ff4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -23,15 +23,12 @@ I would like to use this configuration on a large variety of machines with
 different needs. To accommodate for this, the configuration is split up into
 multiple files and a different set of plugins is used:
 
-- In any case, the plugin set in `plugins.vim` is loaded.
-- If run as non-root user, an additional plugin set in `plugins-noroot.vim` is
-  loaded.
-- If run on a no-low-end-box, an additional plugin set in
-  `plugins-noroot-nolowendbox.vim` is loaded. A low-end box is indicated by the
-  existence of the file `lowendbox`, e.g., on my Raspberry Pi installations.
-- Also, if `plugins-local.vim` exists, this plugin set is loaded, too. For
-  instance, on one machine I have gnupg and corresponding vim plugins
-  configured.
+- In any case, the plugin set in `plugins-mini.vim` is loaded.
+- Furthermore, `plugins-midi.vim`, `plugins-full.vim` and `plugins-local.vim`
+  are loaded if present. They are provided as `plugins-xxx.vim.example` and you
+  can create a symlink `plugins-xxx.vim` to have them loaded. (In case of
+  `plugins-local.vim` you will probably provide a machine-dedicated version
+  rather than symlinking the example file.)
 
 Similar to `plugins-local.vim`, also the following files are sourced if
 existent:

diff --git a/init.vim b/init.vim
index 9700a32330881a913e40b041892b1ba2d98235f7..a01889a6a9580177d93681b32a84ed3f5f1a140c 100644 (file)
--- a/init.vim
+++ b/init.vim
@@ -49,12 +49,6 @@ endif
 
 syntax on
 
-if filereadable($HOME . '/.vim/lowendbox')
-    let g:lowendbox = 1
-else
-    let g:lowendbox = 0
-endif
-
 runtime macros.vim
 runtime keymaps.vim
 runtime plugsetup.vim

diff --git a/plugins-noroot-nolowendbox.vim b/plugins-full.vim.example
similarity index 99%
rename from plugins-noroot-nolowendbox.vim
rename to plugins-full.vim.example
index f442a5d99ede87b491efe185bb27aa70d39e94a4..a4095e649a718de06ae4aa6afae9e13d4e5cea94 100644 (file)
--- a/plugins-noroot-nolowendbox.vim
+++ b/plugins-full.vim.example
@@ -48,6 +48,7 @@ else
 endif
 
 Plug 'ryanoasis/vim-devicons', Cond(g:enable_plugin_devicons)
+
 Plug 'joom/latex-unicoder.vim'
 Plug 'chrisbra/unicode.vim'
 
@@ -70,7 +71,7 @@ if has('nvim-0.5')
     Plug 'nvim-treesitter/nvim-treesitter-refactor', {'do': ':TSUpdate'}
 endif
 
-function PluginsNorootNolowendboxConfig()
+function PluginsConfigFull()
     let g:neomake_c_enabled_makers = ['clangtidy', 'clangcheck']
     let g:neomake_cpp_enabled_makers = ['clangtidy', 'clangcheck']
     let g:clang_compilation_database = '.'

diff --git a/plugins-local.vim.example b/plugins-local.vim.example
index 49d6cdf64b45010d57336549ff08df4eb5bcf480..b7c7a73d5707dd1b9fb786e049def126d872bc22 100644 (file)
--- a/plugins-local.vim.example
+++ b/plugins-local.vim.example
@@ -1,5 +1,3 @@
-Plug 'jamessan/vim-gnupg'
-
 "Plug 'kien/tabman.vim'
 
 "Plug 'chikamichi/mediawiki.vim'

diff --git a/plugins-noroot.vim b/plugins-midi.vim.example
similarity index 97%
rename from plugins-noroot.vim
rename to plugins-midi.vim.example
index 81411f946ee38dd0e9beb7af959538cbaa4de2b6..ca75f178f4cfaac1a773a39ff538f87542f8c00e 100644 (file)
--- a/plugins-noroot.vim
+++ b/plugins-midi.vim.example
@@ -1,5 +1,7 @@
 Plug 'majutsushi/tagbar', {'on': 'TagbarToggle'}
 
+Plug 'jamessan/vim-gnupg'
+
 " Conditional loading does not work, see github issue #823
 Plug 'ludovicchabant/vim-gutentags'
 "Plug 'vim-scripts/Conque-GDB', {'for': ['c', 'cpp', 'objc']}
@@ -29,7 +31,7 @@ Plug 'vim-scripts/loremipsum', {'on': 'Loremipsum'}
 
 Plug 'ggandor/leap.nvim'
 
-function PluginsNorootConfig()
+function PluginsConfigMidi()
     let g:localvimrc_persistent = 1
 
     let g:EditorConfig_exclude_patterns = ['fugitive://.*', 'scp://.*']

diff --git a/plugins.vim b/plugins-mini.vim
similarity index 99%
rename from plugins.vim
rename to plugins-mini.vim
index 66939e622131dafdff86b125b44b48433dc2451f..8748a31bb7776efe7d0878bd746322dec35d5e4c 100644 (file)
--- a/plugins.vim
+++ b/plugins-mini.vim
@@ -34,7 +34,7 @@ Plug 'flwyd/vim-conjoin'
 Plug 'nfnty/vim-nftables'
 
 
-function PluginsConfig()
+function PluginsConfigMini()
 
     " Some preferences for indent detection
     let g:detectindent_min_indent = 2

diff --git a/plugsetup.vim b/plugsetup.vim
index f47a045aecfecafe4de8fde09287bdbf31ac7d9f..f34150d70a545c6f25f37ab89ec3e520ad9836d9 100644 (file)
--- a/plugsetup.vim
+++ b/plugsetup.vim
@@ -9,34 +9,39 @@ endif
 
 call plug#begin('~/.vim/plugged')
 
-source ~/.vim/plugins.vim
+source ~/.vim/plugins-mini.vim
 
 " Load various conditinoal plugin sets
-if filereadable($HOME . '/.vim/plugins-local.vim')
-    source ~/.vim/plugins-local.vim
+
+if filereadable($HOME . '/.vim/plugins-midi.vim')
+    source ~/.vim/plugins-midi.vim
 endif
 
-if $USER != "root"
-    source ~/.vim/plugins-noroot.vim
+if filereadable($HOME . '/.vim/plugins-full.vim')
+    source ~/.vim/plugins-full.vim
+endif
 
-    if g:lowendbox == 0
-        source ~/.vim/plugins-noroot-nolowendbox.vim
-    endif
+if filereadable($HOME . '/.vim/plugins-local.vim')
+    source ~/.vim/plugins-local.vim
 endif
 
 call plug#end()
 
 
-" Call the config functions of the plugins
-call PluginsConfig()
-if filereadable($HOME . '/.vim/plugins-local.vim')
-    call PluginsLocalConfig()
+" Call config functions of plugin sets
+
+call PluginsConfigMini()
+
+if filereadable($HOME . '/.vim/plugins-midi.vim')
+    call PluginsConfigMidi()
 endif
-if $USER != "root"
-    call PluginsNorootConfig()
-    if g:lowendbox == 0
-        call PluginsNorootNolowendboxConfig()
-    endif
+
+if filereadable($HOME . '/.vim/plugins-full.vim')
+    call PluginsConfigFull()
+endif
+
+if filereadable($HOME . '/.vim/plugins-local.vim')
+    call PluginsConfigLocal()
 endif