From d5f27b49bd079f17dfa4e5395c0cb9b1e18143ef Mon Sep 17 00:00:00 2001 From: Joe Date: Fri, 8 Sep 2023 16:13:42 +0200 Subject: up --- .config/nvim/init.lua | 2 +- .config/nvim/lua/bindings.lua | 20 ++++++------ .config/nvim/lua/plug.lua | 4 +-- .config/nvim/lua/plugs-config/rainbow.lua | 23 +++++++++++++- .config/nvim/lua/plugs-config/startify.lua | 49 ++++++++++++++++++++++++++++++ .config/nvim/plug-config/startify.vim | 30 ------------------ 6 files changed, 84 insertions(+), 44 deletions(-) create mode 100644 .config/nvim/lua/plugs-config/startify.lua delete mode 100644 .config/nvim/plug-config/startify.vim (limited to '.config') 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', '', 'q', { noremap = true, silent = false }) vim.keymap.set('n', '*', '*zz', { noremap = true, silent = false }) vim.keymap.set('n', '', 'zz', { noremap = true, silent = false }) vim.keymap.set('n', '', 'zz', { noremap = true, silent = false }) -vim.keymap.set('n', '', 'AirlineSelectTab1') -vim.keymap.set('n', '', 'AirlineSelectTab2') -vim.keymap.set('n', '', 'AirlineSelectTab3') -vim.keymap.set('n', '', 'AirlineSelectTab4') -vim.keymap.set('n', '', 'AirlineSelectTab5') -vim.keymap.set('n', '', 'AirlineSelectTab6') -vim.keymap.set('n', '', 'AirlineSelectTab7') -vim.keymap.set('n', '', 'AirlineSelectTab8') -vim.keymap.set('n', '', 'AirlineSelectTab9') -vim.keymap.set('n', '', 'AirlineSelectTab10') +vim.keymap.set('n', '', ':b1') +vim.keymap.set('n', '', ':b2') +vim.keymap.set('n', '', ':b3') +vim.keymap.set('n', '', ':b4') +vim.keymap.set('n', '', ':b5') +vim.keymap.set('n', '', ':b6') +vim.keymap.set('n', '', ':b7') +vim.keymap.set('n', '', ':b8') +vim.keymap.set('n', '', ':b9') +vim.keymap.set('n', '', ':b10') vim.keymap.set('i', '', 'pumvisible() ? "" : ""', { expr = true }) vim.keymap.set('i', '', 'pumvisible() ? "" : ""', { expr = true }) vim.keymap.set('i', '', 'pumvisible() ? asyncomplete#close_popup() : "\\"', { 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' }, - \ ] -- cgit v1.2.3