From b2b3b75d24ecd9f5afdbeefa06dee79547531929 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 30 Aug 2022 12:57:56 -0700 Subject: [PATCH 1/9] nvim: add nvim-bqf --- .config/nvim/lua/blake/plugins.lua | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index aab9106..2576540 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -274,13 +274,16 @@ return require('packer').startup({function() require('blake.other').telescope() end } - use { + use { -- trouble: one big list of code errors from all sources (lsp, quickfix) 'folke/trouble.nvim', requires = "kyazdani42/nvim-web-devicons", config = function() require('trouble').setup({ mode = "quickfix" }) end } + use { -- bqf: improved quickfix list + 'kevinhwang91/nvim-bqf', + } use { -- gitsigns: git integration 'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' }, From 9deaa4ebb420afde0322e5c18d5946471fcb1529 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 30 Aug 2022 12:59:07 -0700 Subject: [PATCH 2/9] nvim: restrict bqf to quickfix lists (lazy load) --- .config/nvim/lua/blake/plugins.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 2576540..1d496a4 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -283,6 +283,7 @@ return require('packer').startup({function() } use { -- bqf: improved quickfix list 'kevinhwang91/nvim-bqf', + ft = 'qf', } use { -- gitsigns: git integration 'lewis6991/gitsigns.nvim', From 95a3ef64631d01b7057dea2c7a248ea3f1fe9184 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 30 Aug 2022 13:09:48 -0700 Subject: [PATCH 3/9] nvim: add nvim-pqf --- .config/nvim/lua/blake/plugins.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 1d496a4..e18c5fe 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -285,6 +285,10 @@ return require('packer').startup({function() 'kevinhwang91/nvim-bqf', ft = 'qf', } + use { -- pqf: prettier quickfix list + 'https://gitlab.com/yorickpeterse/nvim-pqf', + ft = 'qf', + } use { -- gitsigns: git integration 'lewis6991/gitsigns.nvim', requires = { 'nvim-lua/plenary.nvim' }, From 080ecf0cd9a318b0df198236f670e5b3927fd501 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 30 Aug 2022 13:40:38 -0700 Subject: [PATCH 4/9] nvim: prefer command abbreviations to user-defined commands --- .config/nvim/lua/blake/other.lua | 8 ++++---- .config/nvim/lua/blake/plugins.lua | 16 +++++++++++----- .config/nvim/lua/blake/settings.lua | 28 ++++++++++++++-------------- 3 files changed, 29 insertions(+), 23 deletions(-) diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua index 6f65e73..fad6847 100644 --- a/.config/nvim/lua/blake/other.lua +++ b/.config/nvim/lua/blake/other.lua @@ -180,7 +180,7 @@ end -- ZenMode >>> M.zenmode = function() -- map :ZM to :ZenMode - vim.cmd 'command! ZM ZenMode' + vim.cmd 'cab ZM ZenMode' require("zen-mode").setup { window = { backdrop = 1, -- shade the backdrop of the Zen window. Set to 1 to keep the same as Normal @@ -233,9 +233,9 @@ M.autosession = function() -- save some more things. notably options, resize, winpos, and terminal vim.o.sessionoptions="blank,buffers,curdir,folds,help,tabpages,resize,winpos,terminal" -- So I don't forget which one it is - vim.cmd 'command! SessionSave SaveSession' - vim.cmd 'command! SessionDelete DeleteSession' - vim.cmd 'command! SessionRestore RestoreSession' + vim.cmd 'cab SessionSave SaveSession' + vim.cmd 'cab SessionDelete DeleteSession' + vim.cmd 'cab SessionRestore RestoreSession' end -- <<< -- Lualine >>> diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index e18c5fe..c9e9a81 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -33,7 +33,7 @@ return require('packer').startup({function() 'wbthomason/packer.nvim', config = function() -- Map :PS to :PackerSync - vim.cmd 'command! PS PackerSync' + vim.cmd 'cab PS PackerSync' end, } @@ -91,7 +91,7 @@ return require('packer').startup({function() use { -- nvim-colorizer: css color tag highlighter (ex- #FFB13B) 'norcalli/nvim-colorizer.lua', config = function() - vim.cmd 'command! COL ColorizerToggle' + vim.cmd 'cab COL ColorizerToggle' end, } use { -- lumen: make vim respect the system light/dark theme setting (linux + macos) @@ -183,7 +183,7 @@ return require('packer').startup({function() use { -- symbols-outline: treesitter-based document outline (SO) 'simrat39/symbols-outline.nvim', config = function() - vim.cmd 'command! SO SymbolsOutline' + vim.cmd 'cab SO SymbolsOutline' vim.cmd 'nnoremap so SymbolsOutline' end, } @@ -331,7 +331,7 @@ return require('packer').startup({function() -- use { -- twilight.nvim: dim text outside paragraph or function -- 'folke/twilight.nvim', -- config = function() - -- vim.cmd 'command! TW Twilight' + -- vim.cmd 'cab TW Twilight' -- require("twilight").setup() -- end, -- } @@ -401,6 +401,12 @@ return require('packer').startup({function() vim.api.nvim_set_keymap('n', 'u', 'UndotreeToggle', { noremap = true, silent = true, }) end } + use { -- macroeditor: edit macros in another window to avoid making LSP mad + 'dohsimpson/vim-macroeditor', + config = function() + vim.cmd 'cab ME MacroEdit' + end + } -- use { -- shade.nvim: dim inactive window -- 'sunjon/shade.nvim', -- config = function() @@ -511,7 +517,7 @@ return require('packer').startup({function() 'rhysd/clever-split.vim', config = function() -- Map :CS to :CleverSplit - vim.cmd 'command! CS CleverSplit' + vim.cmd 'cab CS CleverSplit' end } -- use { -- rhysd: accelerated jk: make j and k move faster by pressing them a lot movement diff --git a/.config/nvim/lua/blake/settings.lua b/.config/nvim/lua/blake/settings.lua index 3766beb..94c7534 100644 --- a/.config/nvim/lua/blake/settings.lua +++ b/.config/nvim/lua/blake/settings.lua @@ -47,27 +47,27 @@ vim.cmd 'let mapleader = " "' -- *sigh*... vim.cmd [[ -command! Q q -command! W w -command! Wq wq -command! WQ wq -command! Wa wa -command! WA wa -command! Qa qa -command! QA qa -command! Wqa wqa -command! WQa wqa -command! WQA wqa +cab Q q +cab W w +cab Wq wq +cab WQ wq +cab Wa wa +cab WA wa +cab Qa qa +cab QA qa +cab Wqa wqa +cab WQa wqa +cab WQA wqa ]] -- Go to previous file, but faster -vim.cmd 'command! P previous' +vim.cmd 'cab P previous' --- Macro for opening a new terminal +-- Macro for opening a terminal in a new tab vim.cmd 'command! Term tabnew | term' -- Genereate ctags -vim.cmd 'command! MakeTags !ctags -R .' +vim.cmd 'cab MakeTags !ctags -R .' -- Write buffer as root vim.cmd 'cmap w!! w !sudo tee > /dev/null %' From 84cddce3655894c803c0f49dd2ff45c7f8a5636a Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 30 Aug 2022 15:51:14 -0700 Subject: [PATCH 5/9] nvim: go to references is now gR (over gr) --- .config/nvim/lua/blake/lsp.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/nvim/lua/blake/lsp.lua b/.config/nvim/lua/blake/lsp.lua index 93ae4f7..9f0df79 100644 --- a/.config/nvim/lua/blake/lsp.lua +++ b/.config/nvim/lua/blake/lsp.lua @@ -241,7 +241,7 @@ M.lspconfig = function() buffmap(bufnr, 'n', 'D', 'lua vim.lsp.buf.type_definition()', opts) buffmap(bufnr, 'n', 'rn', 'lua vim.lsp.buf.rename()', opts) buffmap(bufnr, 'n', 'ca', 'lua vim.lsp.buf.code_action()', opts) - buffmap(bufnr, 'n', 'gr', 'lua require("telescope.builtin").lsp_references()', opts) -- Telescope + buffmap(bufnr, 'n', 'gR', 'lua require("telescope.builtin").lsp_references()', opts) -- Telescope buffmap(bufnr, 'n', 'f', 'lua vim.lsp.buf.format { async = true }', opts) buffmap(bufnr, 'n', 'so', 'lua require("telescope.builtin").lsp_document_symbols()', opts) end -- <<< From 833b39eb1b1f7d20e5266fd576684fcdc2cdbd1e Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 30 Aug 2022 22:51:10 -0700 Subject: [PATCH 6/9] nvim: add CH for :CleverHelp --- .config/nvim/lua/blake/plugins.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index c9e9a81..141232e 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -516,8 +516,10 @@ return require('packer').startup({function() use { -- rhysd: clever-split: split calculation based on pane dimensions - CS or CleverSplit 'rhysd/clever-split.vim', config = function() - -- Map :CS to :CleverSplit - vim.cmd 'cab CS CleverSplit' + vim.cmd [[ + cab CH CleverHelp + cab CS CleverSplit + ]] end } -- use { -- rhysd: accelerated jk: make j and k move faster by pressing them a lot movement From 1b1d93983a03e6577e774ff110f663d320b49522 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Tue, 6 Sep 2022 15:13:58 -0700 Subject: [PATCH 7/9] shell: warn if profile isn't loaded --- .config/shell/shrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.config/shell/shrc b/.config/shell/shrc index d027687..898f137 100644 --- a/.config/shell/shrc +++ b/.config/shell/shrc @@ -38,6 +38,10 @@ error() { # change cursor to a beam by default printf '\e[5 q' +if ! "${PROFILE_LOADED:-false}"; then + echo "Warning: profile was not loaded! Set PROFILE_LOADED to 'true' to disable this warning." >&2 +fi + ### <<< ### Generic shell configuration >>> ### Environment variables >>> From ed88531dfd6c99f8c63f98b210d3453f8fd3585c Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Fri, 9 Sep 2022 00:23:52 -0700 Subject: [PATCH 8/9] nvim: change to main comment.nvim repo --- .config/nvim/lua/blake/plugins.lua | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 141232e..d2b5227 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -459,8 +459,7 @@ return require('packer').startup({function() 'RRethy/nvim-align', } use { -- comment.nvim: toggle comments - gb and gc - 'PowerUser64/Comment.nvim', - branch = 'lockmarks', + 'numToStr/Comment.nvim', config = function() require('Comment').setup { mappings = { From a0f0fe81eba3ace2cd7380101f4d9f16cb969088 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Fri, 9 Sep 2022 02:16:08 -0700 Subject: [PATCH 9/9] shell: rename smctl alias to scl --- .config/shell/aliases | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.config/shell/aliases b/.config/shell/aliases index b30eade..77b372d 100644 --- a/.config/shell/aliases +++ b/.config/shell/aliases @@ -29,7 +29,7 @@ fi alias \ mkd="mkdir -p" \ g=git \ - smctl='sudo systemctl' \ + scl='sudo systemctl' \ # <<< ## Program improvements (ex: ls = ls -h) >>>