up

6 files changed, 84 insertions, 44 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index f819dbe..5348f86 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -29,6 +29,6 @@ require('plugs-config/nerd-commenter')
 require('plugs-config/org')
 require('plugs-config/quickscope')
 require('plugs-config/rainbow')
-vim.cmd('source ' .. confdir .. '/nvim/plug-config/startify.vim')
+require('plugs-config/startify')
 vim.cmd('source ' .. confdir .. '/nvim/plug-config/signify.vim')
 vim.cmd('source ' .. confdir .. '/nvim/plug-config/vim-lsp.vim')
diff --git a/.config/nvim/lua/bindings.lua b/.config/nvim/lua/bindings.lua
index 49f2cf9..63ea8df 100644
--- a/.config/nvim/lua/bindings.lua
+++ b/.config/nvim/lua/bindings.lua
@@ -11,16 +11,16 @@ vim.keymap.set('n', '<C-q>', '<C-w>q', { noremap = true, silent = false })
 vim.keymap.set('n', '*', '*zz', { noremap = true, silent = false })
 vim.keymap.set('n', '<C-d>', '<C-d>zz', { noremap = true, silent = false })
 vim.keymap.set('n', '<C-u>', '<C-u>zz', { noremap = true, silent = false })
-vim.keymap.set('n', '<M-1>', '<Plug>AirlineSelectTab1')
-vim.keymap.set('n', '<M-2>', '<Plug>AirlineSelectTab2')
-vim.keymap.set('n', '<M-3>', '<Plug>AirlineSelectTab3')
-vim.keymap.set('n', '<M-4>', '<Plug>AirlineSelectTab4')
-vim.keymap.set('n', '<M-5>', '<Plug>AirlineSelectTab5')
-vim.keymap.set('n', '<M-6>', '<Plug>AirlineSelectTab6')
-vim.keymap.set('n', '<M-7>', '<Plug>AirlineSelectTab7')
-vim.keymap.set('n', '<M-8>', '<Plug>AirlineSelectTab8')
-vim.keymap.set('n', '<M-9>', '<Plug>AirlineSelectTab9')
-vim.keymap.set('n', '<M-0>', '<Plug>AirlineSelectTab10')
+vim.keymap.set('n', '<M-1>', ':b1<CR>')
+vim.keymap.set('n', '<M-2>', ':b2<CR>')
+vim.keymap.set('n', '<M-3>', ':b3<CR>')
+vim.keymap.set('n', '<M-4>', ':b4<CR>')
+vim.keymap.set('n', '<M-5>', ':b5<CR>')
+vim.keymap.set('n', '<M-6>', ':b6<CR>')
+vim.keymap.set('n', '<M-7>', ':b7<CR>')
+vim.keymap.set('n', '<M-8>', ':b8<CR>')
+vim.keymap.set('n', '<M-9>', ':b9<CR>')
+vim.keymap.set('n', '<M-0>', ':b10<CR>')
 vim.keymap.set('i', '<C-j>', 'pumvisible() ? "<C-n>" : "<C-j>"', { expr = true })
 vim.keymap.set('i', '<C-k>', 'pumvisible() ? "<C-p>" : "<C-k>"', { expr = true })
 vim.keymap.set('i', '<cr>',  'pumvisible() ? asyncomplete#close_popup() : "\\<cr>"', { expr = true })
diff --git a/.config/nvim/lua/plug.lua b/.config/nvim/lua/plug.lua
index d28841e..d37b99e 100644
--- a/.config/nvim/lua/plug.lua
+++ b/.config/nvim/lua/plug.lua
@@ -11,12 +11,11 @@ Plug('jiangmiao/auto-pairs')
 Plug('junegunn/fzf')
 Plug('junegunn/fzf.vim')
 Plug('folke/which-key.nvim')
-Plug('luochen1990/rainbow')
 Plug('mbbill/undotree')
-Plug('mg979/vim-visual-multi')
 Plug('mhinz/vim-signify')
 Plug('mhinz/vim-startify')
 Plug('morhetz/gruvbox')
+Plug('mg979/vim-visual-multi')
 Plug('prabirshrestha/async.vim')
 Plug('prabirshrestha/asyncomplete.vim')
 Plug('keremc/asyncomplete-clang.vim')
@@ -44,6 +43,7 @@ Plug('chrisbra/csv.vim')
 Plug('nvim-telescope/telescope.nvim')
 Plug('nvim-lua/plenary.nvim')
 Plug('ThePrimeagen/harpoon')
+Plug('HiPhish/rainbow-delimiters.nvim')
 Plug('nvim-treesitter/nvim-treesitter', {['do'] = ':TSUpdate'})
 
 vim.call('plug#end')
diff --git a/.config/nvim/lua/plugs-config/rainbow.lua b/.config/nvim/lua/plugs-config/rainbow.lua
index 63e9c7c..e0951b8 100644
--- a/.config/nvim/lua/plugs-config/rainbow.lua
+++ b/.config/nvim/lua/plugs-config/rainbow.lua
@@ -1,2 +1,23 @@
 -- Rainbow
-vim.g.rainbow_active = 1
+-- This module contains a number of default definitions
+local rainbow_delimiters = require 'rainbow-delimiters'
+
+vim.g.rainbow_delimiters = {
+    strategy = {
+        [''] = rainbow_delimiters.strategy['global'],
+        vim = rainbow_delimiters.strategy['local'],
+    },
+    query = {
+        [''] = 'rainbow-delimiters',
+        lua = 'rainbow-blocks',
+    },
+    highlight = {
+        'RainbowDelimiterOrange',
+        'RainbowDelimiterRed',
+        'RainbowDelimiterYellow',
+        'RainbowDelimiterBlue',
+        'RainbowDelimiterGreen',
+        'RainbowDelimiterViolet',
+        'RainbowDelimiterCyan',
+    },
+}
diff --git a/.config/nvim/lua/plugs-config/startify.lua b/.config/nvim/lua/plugs-config/startify.lua
new file mode 100644
index 0000000..7fd33a4
--- /dev/null
+++ b/.config/nvim/lua/plugs-config/startify.lua
@@ -0,0 +1,49 @@
+-- Startify
+vim.cmd [[
+let g:startify_custom_header = startify#pad([
+\ '=================================================================',
+\ '=======================    ======================================',
+\ '========================  =======================================',
+\ '========================  =======================================',
+\ '========================  ====   ====   =========================',
+\ '========================  ===     ==  =  ========================',
+\ '========================  ===  =  ==     ========================',
+\ '===================  ===  ===  =  ==  ===========================',
+\ '===================  ===  ===  =  ==  =  ========================',
+\ '====================     =====   ====   =========================',
+\ '=================================================================',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⡟⡿⢯⡻⡝⢯⡝⡾⣽⣻⣟⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⢻⠳⣏⠧⠹⡘⢣⠑⠎⠱⣈⠳⢡⠳⢭⣛⠷⣟⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣝⣎⢣⠡⠌⣢⠧⠒⠃⠁⠈⠉⠉⠑⠓⠚⠦⣍⡞⡽⣞⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣝⠮⡜⣢⠕⠊⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⠉⠐⠄⡙⠲⣝⡺⡽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣿⣿⡹⢎⣳⠞⡡⠊⠀⠀⠀⣀⣤⣤⣶⣶⣤⣤⣀⡈⠂⠄⠙⠱⡌⠳⣹⢎⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⣽⣟⣳⡝⡼⢁⠎⠀⡀⢁⣴⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣶⡄⠰⣄⠈⠓⢌⠛⢽⣣⡟⢿⠿⣿⣿⢿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⡿⣽⠳⡼⢁⡞⠀⡜⢰⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡆⢸⢵⠀⠀⠁⠂⠤⣉⠉⠓⠒⠚⠦⠥⡈⠉⣙⢛⡿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⡾⣽⣏⢳⢃⣞⠃⡼⢀⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡄⠀⠀⠀⠀⠀⠀⠀⠀⠁⢀⣀⠤⠐⢋⡰⣌⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣟⣮⢳⣿⠶⠁⠖⠃⠀⠁⢸⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⠿⠟⠛⠛⠀⠀⠀⠀⢀⡤⠤⠐⠒⣉⠡⣄⠶⣭⣿⣽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⡿⠿⢉⡢⠝⠁⠀⠃⠀⠀⠀⠀⠀⠿⠃⠿⠿⠿⠛⠋⠉⠁⠀⠀⠀⠀⠀⠀⠀⠀⠀⣀⠀⣀⢤⣰⣲⣽⣾⡟⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣟⡿⡚⠏⠁⠀⠐⠉⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⣠⠂⣠⠀⣯⣗⣮⢿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⢯⡝⠠⠁⠀⠀⠠⠤⠀⠀⠀⠀⡀⠢⣄⣀⡀⠐⠤⡀⠀⠀⠀⢤⣄⣀⠤⣄⣤⢤⣖⡾⠋⢁⡼⠁⣸⡿⣞⣽⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣷⣾⣵⣦⣶⣖⣳⣶⣝⣶⣯⣷⣽⣷⣾⣶⣽⣯⣶⠄⠈⠒⣤⣀⠉⠙⠛⠛⠋⠋⢁⣠⠔⠁⠀⢰⣿⣽⣯⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣦⡄⡀⡉⠛⠓⠶⠶⠒⠛⠋⠀⠀⢀⣼⣻⢷⣾⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣾⣧⡵⣌⣒⢂⠀⣀⣀⣠⣤⣶⣿⣾⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣷⣿⣾⣷⣯⣿⣧⣿⣷⣿⣷⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ '⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿⣿',
+\ ])
+let g:startify_lists = [
+            \ { 'type': 'sessions',  'header': startify#pad(['Sessions'])	},
+            \ { 'type': 'files',     'header': startify#pad(['Recent'])		},
+            \ { 'type': 'bookmarks', 'header': startify#pad(['Bookmarks'])	},
+            \ { 'type': 'commands',  'header': startify#pad(['Commands'])	},
+            \ ]
+]]
+vim.g.startify_bookmarks = {
+	{ env = '~/.config/env' },
+	{ v   = '~/.config/nvim/init.vim' },
+	{ zc  = '~/.config/zsh/.zshrc' },
+	{ za  = '~/.config/zsh/alias.zsh' },
+	{ gj  = '~/dev/go/gojosh' },
+}
diff --git a/.config/nvim/plug-config/startify.vim b/.config/nvim/plug-config/startify.vim
deleted file mode 100644
index 627158d..0000000
--- a/.config/nvim/plug-config/startify.vim
+++ /dev/null
@@ -1,30 +0,0 @@
-" Startify
-let g:startify_custom_header = startify#pad([
-			\ '  _____________________________________ ',
-			\ ' /                                     \',
-			\ ' |    Hi, partner, welcome_back to     |',
-			\ ' |  _ __   ___  _____   _(_)_ __ ___   |',
-			\ ' | | ''_ \ / _ \/ _ \ \ / / | ''_ ` _ \  |',
-			\ ' | | | | |  __/ (_) \ V /| | | | | | | |',
-			\ ' | |_| |_|\___|\___/ \_/ |_|_| |_| |_| |',
-			\ ' \                                     /',
-			\ '  ------------------------------------- ',
-			\ '         \   ^__^                       ',
-			\ '          \  (oo)\_______               ',
-			\ '             (__)\       )\/\           ',
-			\ '                 ||----w |              ',
-			\ '                 ||     ||              ',
-			\ ])
-let g:startify_lists = [
-			\ { 'type': 'sessions',  'header': startify#pad(['Sessions'])	},
-			\ { 'type': 'files',     'header': startify#pad(['Recent'])		},
-			\ { 'type': 'bookmarks', 'header': startify#pad(['Bookmarks'])	},
-			\ { 'type': 'commands',  'header': startify#pad(['Commands'])	},
-			\ ]
-let g:startify_bookmarks = [
-			\ { 'env': '~/.config/env' },
-			\ { 'v': '~/.config/nvim/init.vim' },
-			\ { 'zc': '~/.config/zsh/.zshrc' },
-			\ { 'za': '~/.config/zsh/alias.zsh' },
-			\ { 'gj': '~/dev/go/gojosh' },
-			\ ]