From 4b9cae31e59df1d3cddd31884ec6a21d87e03a43 Mon Sep 17 00:00:00 2001
From: tdro <tdro@users.noreply.github.com>
Date: Wed, 23 Jun 2021 02:02:37 -0400
Subject: .vimrc: Merge plugin configuration

---
 .vim/plugins.vim | 19 -------------------
 .vimrc           | 21 +++++++++++++++++++--
 2 files changed, 19 insertions(+), 21 deletions(-)
 delete mode 100644 .vim/plugins.vim

diff --git a/.vim/plugins.vim b/.vim/plugins.vim
deleted file mode 100644
index 030c306..0000000
--- a/.vim/plugins.vim
+++ /dev/null
@@ -1,19 +0,0 @@
-" Source plugin manager
-so ~/.vim/bundle/vim-plug/plug.vim
-
-" Specify a directory for plugins
-call plug#begin('~/.vim/bundle')
-
-Plug 'junegunn/vim-plug',         { 'tag': 'e718868e85e2a32410144dfcdc3ba1303719450d' }
-Plug 'junegunn/fzf.vim',          { 'tag': 'f86ef1bce602713fe0b5b68f4bdca8c6943ecb59' }
-Plug 'sjl/gundo.vim',             { 'tag': 'c5efef192b975b8e7d5fa3c6db932648d3b76323' }
-Plug 'mcchrish/nnn.vim',          { 'tag': 'bfc91b503769920a366b12851b871795c0eb6825' }
-Plug 'tpope/vim-fugitive',        { 'tag': '85e2c73830b6bb01ce7fc3a926d2b25836a253eb' }
-Plug 'gerw/vim-HiLinkTrace',      { 'tag': '64da6bf463362967876fdee19c6c8d7dd3d0bf0f' }
-Plug 'elixir-editors/vim-elixir', { 'tag': '53c530f79cfcd12498e31fcf8ecc466eba34c75c' }
-
-" Enable fzf.vim on Debian.
-silent! source /usr/share/doc/fzf/examples/fzf.vim
-
-" Initialize plugin system
-call plug#end()
diff --git a/.vimrc b/.vimrc
index 7c0d349..bf1fb71 100644
--- a/.vimrc
+++ b/.vimrc
@@ -3,7 +3,25 @@
 mapclear                                 " Clear all mappings.
 packadd! matchit                         " Add match tag pairs package.
 let skip_defaults_vim=1                  " Do not load defaults if ~/.vimrc is missing.
-so ~/.vim/plugins.vim                    " Source plugins.
+
+
+"------------Plugins------------"
+
+source ~/.vim/bundle/vim-plug/plug.vim   " Source plugin manager
+
+call plug#begin('~/.vim/bundle')         " Specify a directory for plugins
+
+Plug 'junegunn/vim-plug',         { 'tag': 'e718868e85e2a32410144dfcdc3ba1303719450d' }
+Plug 'junegunn/fzf.vim',          { 'tag': 'f86ef1bce602713fe0b5b68f4bdca8c6943ecb59' }
+Plug 'sjl/gundo.vim',             { 'tag': 'c5efef192b975b8e7d5fa3c6db932648d3b76323' }
+Plug 'mcchrish/nnn.vim',          { 'tag': 'bfc91b503769920a366b12851b871795c0eb6825' }
+Plug 'tpope/vim-fugitive',        { 'tag': '85e2c73830b6bb01ce7fc3a926d2b25836a253eb' }
+Plug 'gerw/vim-HiLinkTrace',      { 'tag': '64da6bf463362967876fdee19c6c8d7dd3d0bf0f' }
+Plug 'elixir-editors/vim-elixir', { 'tag': '53c530f79cfcd12498e31fcf8ecc466eba34c75c' }
+
+silent! source /usr/share/doc/fzf/examples/fzf.vim  " Enable fzf.vim on Debian.
+
+call plug#end()                                     " Initialize plugin system
 
 
 "------------General------------"
@@ -112,7 +130,6 @@ endfunction
 
 " Edit shortcuts
 nmap <leader>ev :tabedit ~/.vimrc<cr>
-nmap <leader>ep :tabedit ~/.vim/plugins.vim<cr>
 nmap <leader>eh :tabedit ~/.vim/post-save-hook<cr>
 
 " Git, tags, and help commands
-- 
cgit v1.2.3