From 08a5953fc661fda379eba4499868d7e2819c6eb0 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Wed, 2 Feb 2022 00:45:27 +0100 Subject: [PATCH] vim: move plugin configurations to after/plugin/*.lua --- nvim/.config/nvim/after/plugin/ctrlp.lua | 4 +++ nvim/.config/nvim/after/plugin/nerdtree.lua | 6 ++++ .../nvim/after/plugin/rainbow_parentheses.lua | 7 ++++ nvim/.config/nvim/after/plugin/srec.lua | 10 ++++++ .../nvim/after/plugin/vim-fugitive.lua | 6 ++++ nvim/.config/nvim/after/plugin/vim-json.lua | 11 ++++++ .../nvim/after/plugin/vim-markdown.lua | 15 ++++++++ .../after/plugin/vim-trailing-whitespace.lua | 5 +++ nvim/.config/nvim/lua/fs/keymap.lua | 24 +++++++++++++ nvim/.config/nvim/lua/fs/keymaps.lua | 13 ------- nvim/.config/nvim/lua/fs/plugins.lua | 34 ++----------------- 11 files changed, 90 insertions(+), 45 deletions(-) create mode 100644 nvim/.config/nvim/after/plugin/ctrlp.lua create mode 100644 nvim/.config/nvim/after/plugin/nerdtree.lua create mode 100644 nvim/.config/nvim/after/plugin/rainbow_parentheses.lua create mode 100644 nvim/.config/nvim/after/plugin/srec.lua create mode 100644 nvim/.config/nvim/after/plugin/vim-fugitive.lua create mode 100644 nvim/.config/nvim/after/plugin/vim-json.lua create mode 100644 nvim/.config/nvim/after/plugin/vim-markdown.lua create mode 100644 nvim/.config/nvim/after/plugin/vim-trailing-whitespace.lua create mode 100644 nvim/.config/nvim/lua/fs/keymap.lua diff --git a/nvim/.config/nvim/after/plugin/ctrlp.lua b/nvim/.config/nvim/after/plugin/ctrlp.lua new file mode 100644 index 0000000..74277d2 --- /dev/null +++ b/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 + diff --git a/nvim/.config/nvim/after/plugin/nerdtree.lua b/nvim/.config/nvim/after/plugin/nerdtree.lua new file mode 100644 index 0000000..481cd70 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/nerdtree.lua @@ -0,0 +1,6 @@ +local nmap = require'fs.keymap'.nmap + +-- toggle NERDTree +nmap { 'n', 'NERDTreeToggle' } + + diff --git a/nvim/.config/nvim/after/plugin/rainbow_parentheses.lua b/nvim/.config/nvim/after/plugin/rainbow_parentheses.lua new file mode 100644 index 0000000..0c570b4 --- /dev/null +++ b/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 { 'p', 'RainbowParentheses!!' } + diff --git a/nvim/.config/nvim/after/plugin/srec.lua b/nvim/.config/nvim/after/plugin/srec.lua new file mode 100644 index 0000000..507f984 --- /dev/null +++ b/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 +]]) + diff --git a/nvim/.config/nvim/after/plugin/vim-fugitive.lua b/nvim/.config/nvim/after/plugin/vim-fugitive.lua new file mode 100644 index 0000000..cd31eb4 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/vim-fugitive.lua @@ -0,0 +1,6 @@ +local nmap = require'fs.keymap'.nmap + +-- use fugitive +nmap { 'gg', 'G' } +nmap { 'g', 'G ' } + diff --git a/nvim/.config/nvim/after/plugin/vim-json.lua b/nvim/.config/nvim/after/plugin/vim-json.lua new file mode 100644 index 0000000..d61a1c1 --- /dev/null +++ b/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 +]]) + diff --git a/nvim/.config/nvim/after/plugin/vim-markdown.lua b/nvim/.config/nvim/after/plugin/vim-markdown.lua new file mode 100644 index 0000000..ae96693 --- /dev/null +++ b/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 { '+', '.,.HeaderIncrease' } +nmap { '=', '.,.HeaderIncrease' } +nmap { '-', '.,.HeaderDecrease' } + diff --git a/nvim/.config/nvim/after/plugin/vim-trailing-whitespace.lua b/nvim/.config/nvim/after/plugin/vim-trailing-whitespace.lua new file mode 100644 index 0000000..3c9f216 --- /dev/null +++ b/nvim/.config/nvim/after/plugin/vim-trailing-whitespace.lua @@ -0,0 +1,5 @@ +local nmap = require'fs.keymap'.nmap + +-- fix whitespace +nmap { 'w', 'FixWhitespace' } + diff --git a/nvim/.config/nvim/lua/fs/keymap.lua b/nvim/.config/nvim/lua/fs/keymap.lua new file mode 100644 index 0000000..ff18606 --- /dev/null +++ b/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 + diff --git a/nvim/.config/nvim/lua/fs/keymaps.lua b/nvim/.config/nvim/lua/fs/keymaps.lua index 798f793..ef70e05 100644 --- a/nvim/.config/nvim/lua/fs/keymaps.lua +++ b/nvim/.config/nvim/lua/fs/keymaps.lua @@ -62,22 +62,9 @@ register { -- quickly change background M('n', 'bg', [[:let &background = &background ==? 'light' ? 'dark' : 'light']]), - -- use fugitive - M('n', 'gg', ':G'), - M('n', 'g', ':G '), - -- disable highlight until next search M('n', 'h', ':nohlsearch'), - -- toggle NERDTree - M('n', 'n', ':NERDTreeToggle'), - - -- toggle rainbow parens - M('n', 'p', ':RainbowParentheses!!'), - -- edit init.lua M('n', 'v', ':e $MYVIMRC'), - - -- fix whitespace - M('n', 'w', ':FixWhitespace'), } diff --git a/nvim/.config/nvim/lua/fs/plugins.lua b/nvim/.config/nvim/lua/fs/plugins.lua index e85d71f..6d77cce 100644 --- a/nvim/.config/nvim/lua/fs/plugins.lua +++ b/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