From d4a829d414cb71b4610c942a709363c6eb63625e Mon Sep 17 00:00:00 2001 From: Kevin MacMartin Date: Mon, 6 Feb 2023 12:42:14 -0500 Subject: [PATCH] Use the main config for vimpager, and pull vimpager directly into the project rather than requiring it to be separately installed --- .gitmodules | 3 + README.md | 14 ++-- vim/bundle.pager/incsearch.vim | 1 - vim/bundle.pager/vim-markdown-concealed | 1 - vim/bundle.pager/vim-polyglot-darkcloud | 1 - vim/bundle/vimpager | 1 + vim/config/vimpager.vim | 87 ------------------------- vimpagerrc | 49 -------------- 8 files changed, 10 insertions(+), 147 deletions(-) delete mode 120000 vim/bundle.pager/incsearch.vim delete mode 160000 vim/bundle.pager/vim-markdown-concealed delete mode 120000 vim/bundle.pager/vim-polyglot-darkcloud create mode 160000 vim/bundle/vimpager delete mode 100644 vim/config/vimpager.vim delete mode 100644 vimpagerrc diff --git a/.gitmodules b/.gitmodules index 6c4be7e..3cd5ab0 100644 --- a/.gitmodules +++ b/.gitmodules @@ -97,3 +97,6 @@ [submodule "vim/bundle/vim-gutentags"] path = vim/bundle/vim-gutentags url = https://github.com/ludovicchabant/vim-gutentags.git +[submodule "vim/bundle/vimpager"] + path = vim/bundle/vimpager + url = https://github.com/rkitover/vimpager diff --git a/README.md b/README.md index 57ba4eb..6cdb32c 100644 --- a/README.md +++ b/README.md @@ -45,15 +45,13 @@ A theme, config and collection of plugins for Vim. ### Vimpager ### -Once darkcloud-vimconfig has been set up, you can configure `vimpager` _1.x_ to use it by running (assuming the default path @ _"/etc/darkcloud-vimconfig"_): +You can configure your PAGER to use darkcloud-vimconfig using vimpager by adding the following to your bashrc (assuming the default path @ _"/etc/darkcloud-vimconfig"_): -`ln -s /etc/darkcloud-vimconfig/vimpagerrc /etc/vimpagerrc` (for a system-wide configuration), or: - -`ln -s /etc/darkcloud-vimconfig/vimpagerrc ~/.vimpagerrc` (for a given user). - -As usual, to have your system use `vimpager` in place of `less`, you'll need to set the **$PAGER** environment variable to `vimpager`: - -`export PAGER=vimpager`, and configure aliases for less in _"/etc/bash.bashrc"_ or _"~/.bashrc"_: `alias less='vimpager'` +``` +export PAGER=/etc/darkcloud-vimconfig/vim/bundle/vimpager/vimpager +alias less="$PAGER" +alias zless="$PAGER" +``` ## Configuration ## diff --git a/vim/bundle.pager/incsearch.vim b/vim/bundle.pager/incsearch.vim deleted file mode 120000 index 1c043bb..0000000 --- a/vim/bundle.pager/incsearch.vim +++ /dev/null @@ -1 +0,0 @@ -../bundle/incsearch.vim \ No newline at end of file diff --git a/vim/bundle.pager/vim-markdown-concealed b/vim/bundle.pager/vim-markdown-concealed deleted file mode 160000 index 401f9d7..0000000 --- a/vim/bundle.pager/vim-markdown-concealed +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 401f9d729274f87168bf126b9c477c721ce1711a diff --git a/vim/bundle.pager/vim-polyglot-darkcloud b/vim/bundle.pager/vim-polyglot-darkcloud deleted file mode 120000 index b7a9dbf..0000000 --- a/vim/bundle.pager/vim-polyglot-darkcloud +++ /dev/null @@ -1 +0,0 @@ -../bundle/vim-polyglot-darkcloud \ No newline at end of file diff --git a/vim/bundle/vimpager b/vim/bundle/vimpager new file mode 160000 index 0000000..2d3af2b --- /dev/null +++ b/vim/bundle/vimpager @@ -0,0 +1 @@ +Subproject commit 2d3af2bf3d09602d43cbfc294566869a89edfd46 diff --git a/vim/config/vimpager.vim b/vim/config/vimpager.vim deleted file mode 100644 index d93f266..0000000 --- a/vim/config/vimpager.vim +++ /dev/null @@ -1,87 +0,0 @@ -"============================================================" -" " -" Darkcloud Vim Config: vimpager.vim " -" " -" By: Kevin MacMartin (prurigro@gmail.com) " -" Website: https://github.com/prurigro/darkcloud-vimconfig " -" " -" License: MIT " -" " -"============================================================" - -"Undo Unwanted Keymappings: -map v -noremap w -noremap -noremap -noremap -noremap - -"Main Settings: -set nocursorline nocursorcolumn "disable cursor column/line highlighting -set nofoldenable "disable the fold column -set noru laststatus=0 noshowmode "remove statusline -set clipboard=autoselect "autocopy selection -set clipboard+=unnamed "use '*' reg -if has('unnamedplus')|set clipboard+=unnamedplus|endif "if exists, use '+' reg -set autoread "track file changes -autocmd CursorHold * checktime "use CursorHold events to trigger checktime -set conceallevel=2 "enable the conceal feature to hide unnecessary elements -set concealcursor=n "conceal text in the cursor line while in normal mode - -"Override Filetypes: -runtime bundle.pager/vim-markdown-concealed/ftdetect/mkdc.vim - -"Mappings: -"mouse -map -map -map -map -noremap 4zh -noremap 4zh -noremap 4zh -noremap 4zl -noremap 4zl -noremap 4zl - -"movement -noremap 0 -noremap -noremap $ -noremap -noremap -noremap -noremap zL -noremap zH -noremap = + -noremap _ - -noremap 4k -noremap 4j -noremap -noremap -noremap gg0 -noremap G$ -noremap $ -noremap ^ - -"copy/paste -nnoremap Y vg_y - -"search -map / (incsearch-forward) -map ? (incsearch-backward) -map g/ (incsearch-stay) -nnoremap // ':noh' - -"selection -nnoremap gg0vG$ -xnoremap gg0vG$ -nnoremap a gg0vG$ -xnoremap a gg0vG$ - -"toggles -nnoremap ':set wrap!:echo "line wrapping toggled"' -xnoremap ':set wrap!gv' -nnoremap ':set spell!:echo "spell checking toggled"' -xnoremap ':set spell!gv' diff --git a/vimpagerrc b/vimpagerrc deleted file mode 100644 index 36093c7..0000000 --- a/vimpagerrc +++ /dev/null @@ -1,49 +0,0 @@ -"============================================================" -" " -" Darkcloud Vim Config: vimpagerrc " -" " -" By: Kevin MacMartin (prurigro@gmail.com) " -" Website: https://github.com/prurigro/darkcloud-vimconfig " -" " -" License: MIT " -" " -"============================================================" - -"darkcloud vim config folder path: {{{ - " if you want to use darkcloud-vimconfig as a package without symlinking - " the vim folder or placing it @ /etc/darkcloud-vimconfig, create a file - " @ ~/.vim/darkcloud-path.vim and in it place the following, except with - " the path pointing to the cloned repo: - " - " let g:darkcloudpath = "/etc/darkcloud-vimconfig" - - if filereadable(glob("~/.vim/darkcloud-path.vim")) - source ~/.vim/darkcloud-path.vim - else - let g:darkcloudpath = "/etc/darkcloud-vimconfig" - endif -"}}} - -"DARKCLOUD CONFIG AND THEME FILES FOR VIMPAGER: {{{ - "Add Config Directory: (distro-agnostic system-wide) - let &runtimepath = printf('%s,%s/vim,%s/vim/after',&runtimepath,g:darkcloudpath,g:darkcloudpath) - - "Load Colour Scheme: - colorscheme default " hack to fix vimrc colorschemes in some versions of vim - colorscheme darkcloud - - "Load Settings: - runtime config/settings.vim - - "Init Plugin Loader: - runtime bundle/vim-pathogen/autoload/pathogen.vim - - "Load Plugins: - execute pathogen#infect('bundle.pager/{}') - - "Vimpager Settings: - runtime config/vimpager.vim - - "Load After Config: - runtime config/after.vim -"}}}