vim: move plugin configurations to after/plugin/*.lua

nvim/.config/nvim/after/plugin/ctrlp.lua

@@ -0,0 +1,4 @@
+vim.g.ctrlp_match_window  = 'bottom,order:ttb'
+vim.g.ctrlp_switch_buffer = 0   -- open files in new buffer
+vim.g.ctrlp_show_hidden   = 1   -- show hidden files
+

nvim/.config/nvim/after/plugin/nerdtree.lua

@@ -0,0 +1,6 @@
+local nmap = require'fs.keymap'.nmap
+
+-- toggle NERDTree
+nmap { '<leader>n', '<cmd>NERDTreeToggle<cr>' }
+
+

nvim/.config/nvim/after/plugin/rainbow_parentheses.lua

@@ -0,0 +1,7 @@
+vim.g['rainbow#pairs'] = { {'(',')'}, {'[',']'}, {'{','}'} }
+
+local nmap = require'fs.keymap'.nmap
+
+-- toggle rainbow parens
+nmap { '<leader>p', '<cmd>RainbowParentheses!!<cr>' }
+

nvim/.config/nvim/after/plugin/srec.lua

@@ -0,0 +1,10 @@
+vim.cmd([[
+    highlight link srecStart        Comment
+    highlight link srecType         Comment
+    highlight link srecLength       WarningMsg
+    highlight link srec16BitAddress Constant
+    highlight link srec24BitAddress Constant
+    highlight link srec32BitAddress Constant
+    highlight link srecChecksum     Type
+]])
+

nvim/.config/nvim/after/plugin/vim-fugitive.lua

@@ -0,0 +1,6 @@
+local nmap = require'fs.keymap'.nmap
+
+-- use fugitive
+nmap { '<leader>gg',        '<cmd>G<cr>' }
+nmap { '<leader>g<space>',  '<cmd>G ' }
+

nvim/.config/nvim/after/plugin/vim-json.lua

@@ -0,0 +1,11 @@
+-- Disable quote concealling.
+vim.g.vim_json_syntax_conceal = 0
+
+-- Make numbers and booleans stand out.
+vim.cmd([[
+  highlight link jsonBraces   Text
+  highlight link jsonNumber   Identifier
+  highlight link jsonBoolean  Identifier
+  highlight link jsonNull     Identifier
+]])
+

nvim/.config/nvim/after/plugin/vim-markdown.lua

@@ -0,0 +1,15 @@
+-- Disable concealling on italic, bold, etc.
+vim.g.vim_markdown_conceal = 0
+
+-- Disable concealling on code blocks.
+vim.g.vim_markdown_conceal_code_blocks = 0
+
+-- Automatic insertion of bullets is buggy. so disable it.
+vim.g.vim_markdown_auto_insert_bullets = 0
+vim.g.vim_markdown_new_list_item_indent = 0
+
+local nmap = require'fs.keymap'.buffer_nmap
+nmap { '<leader>+', '<cmd>.,.HeaderIncrease<cr>' }
+nmap { '<leader>=', '<cmd>.,.HeaderIncrease<cr>' }
+nmap { '<leader>-', '<cmd>.,.HeaderDecrease<cr>' }
+

nvim/.config/nvim/after/plugin/vim-trailing-whitespace.lua

@@ -0,0 +1,5 @@
+local nmap = require'fs.keymap'.nmap
+
+-- fix whitespace
+nmap { '<leader>w', '<cmd>FixWhitespace<cr>' }
+

nvim/.config/nvim/lua/fs/keymap.lua

@@ -0,0 +1,24 @@
+local M = {}
+
+local extend = function(opts)
+  return vim.tbl_extend('keep', opts or {}, { noremap = true })
+end
+
+M.nmap = function(tbl)
+  vim.api.nvim_set_keymap('n', tbl[1], tbl[2], extend(tbl[3]))
+end
+
+M.imap = function(tbl)
+  vim.api.nvim_set_keymap('n', tbl[1], tbl[2], extend(tbl[3]))
+end
+
+M.buffer_nmap = function(tbl)
+  vim.api.nvim_buf_set_keymap(0, 'n', tbl[1], tbl[2], extend(tbl[3]))
+end
+
+M.buffer_imap = function(tbl)
+  vim.api.nvim_buf_set_keymap(0, 'i', tbl[1], tbl[2], extend(tbl[3]))
+end
+
+return M
+

nvim/.config/nvim/lua/fs/keymaps.lua

@@ -62,22 +62,9 @@ register {
   -- quickly change background
   M('n', '<leader>bg', [[:let &background = &background ==? 'light' ? 'dark' : 'light'<cr>]]),
 
-  -- use fugitive
-  M('n', '<leader>gg',        ':G<cr>'),
-  M('n', '<leader>g<space>',  ':G '),
-
   -- disable highlight until next search
   M('n', '<leader>h', ':nohlsearch<cr>'),
 
-  -- toggle NERDTree
-  M('n', '<leader>n', ':NERDTreeToggle<cr>'),
-
-  -- toggle rainbow parens
-  M('n', '<leader>p', ':RainbowParentheses!!<cr>'),
-
   -- edit init.lua
   M('n', '<leader>v', ':e $MYVIMRC<cr>'),
-
-  -- fix whitespace
-  M('n', '<leader>w', ':FixWhitespace<cr>'),
 }

nvim/.config/nvim/lua/fs/plugins.lua

@@ -1,62 +1,32 @@
-local g = vim.g
-
 local plugins = function(use)
     use 'wbthomason/packer.nvim'
 
     -- Visuals ----------------------------------------------------------------
-
     use 'altercation/vim-colors-solarized'
-
     use {
         'nvim-lualine/lualine.nvim',
         requires = { 'kyazdani42/nvim-web-devicons', opt = true }
     }
 
+    -- Navigation -------------------------------------------------------------
     use { 'scrooloose/nerdtree', cmd = 'NERDTreeToggle' }
     use 'junegunn/rainbow_parentheses.vim'
-        vim.g['rainbow#pairs'] = { {'(',')'}, {'[',']'}, {'{','}'} }
     use 'ctrlpvim/ctrlp.vim'
-        g.ctrlp_match_window  = 'bottom,order:ttb'
-        g.ctrlp_switch_buffer = 0   -- open files in new buffer
-        g.ctrlp_show_hidden   = 1   -- show hidden files
-
 
     -- Editing ----------------------------------------------------------------
-
     use 'bronson/vim-trailing-whitespace'
     use 'godlygeek/tabular'
     use 'tpope/vim-commentary'
 
-    -- git     ----------------------------------------------------------------
+    -- git --------------------------------------------------------------------
     use 'tpope/vim-fugitive'
 
     -- Filetypes --------------------------------------------------------------
-
     use 'elzr/vim-json'
-            -- Disable quote concealling.
-            g.vim_json_syntax_conceal = 0
-            -- Make numbers and booleans stand out.
-            vim.cmd([[
-                highlight link jsonBraces   Text
-                highlight link jsonNumber   Identifier
-                highlight link jsonBoolean  Identifier
-                highlight link jsonNull     Identifier
-            ]])
     use 'plasticboy/vim-markdown'
-        g.vim_markdown_conceal_code_blocks = 0
     use 'keith/swift.vim'
     use 'chr4/nginx.vim'
     use 'vim-scripts/srec.vim'
-        vim.cmd([[
-            highlight link srecStart        Comment
-            highlight link srecType         Comment
-            highlight link srecLength       WarningMsg
-            highlight link srec16BitAddress Constant
-            highlight link srec24BitAddress Constant
-            highlight link srec32BitAddress Constant
-            highlight link srecChecksum     Type
-        ]])
-
 
     vim.cmd([[
         silent! colorscheme solarized