From 203556ba97149e26ffb95c144ee95793f86de09b Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:38:17 -0700 Subject: [PATCH 1/9] nvim: show gitsigns where dotfiles live --- .config/nvim/lua/blake/other.lua | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.config/nvim/lua/blake/other.lua b/.config/nvim/lua/blake/other.lua index d64f436..6f65e73 100644 --- a/.config/nvim/lua/blake/other.lua +++ b/.config/nvim/lua/blake/other.lua @@ -111,6 +111,12 @@ M.gitsigns = function() }, attach_to_untracked = true, current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame` + worktrees = { + { + toplevel = vim.env.HOME, + gitdir = vim.env.HOME .. '/git/dotfiles' + }, + }, current_line_blame_opts = { virt_text = true, virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align' From c47d4a5d28d9468597d3409f6a5bce13144b0c7d Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:39:17 -0700 Subject: [PATCH 2/9] nvim: delete old nvim-tree --- .config/nvim/lua/blake/plugins.lua | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index cff5c2b..5c310ad 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -294,13 +294,6 @@ return require('packer').startup({function() require('blake.other').gitsigns() end, } - -- use { -- nvim-tree: file manager - -- 'kyazdani42/nvim-tree.lua', - -- requires = { 'kyazdani42/nvim-web-devicons' }, - -- config = function() - -- require('blake.other').nvimtree() - -- end - -- } use { -- toggleterm: terminal 'akinsho/toggleterm.nvim', branch = 'main', From 9db718e3031783a9a727b1ee6727698ecc900b83 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:40:09 -0700 Subject: [PATCH 3/9] nvim: FIRST PR - now I don't need to use my own illuminate branch --- .config/nvim/lua/blake/plugins.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 5c310ad..6e3cb4f 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -100,11 +100,13 @@ return require('packer').startup({function() 'vimpostor/vim-lumen', } use { -- vim-illuminate: highlight other occurrences of the word under cursor - -- 'RRethy/vim-illuminate', - -- commit = '27f6ef135a88d9410a33cf92fc47f5c018df552c', - 'PowerUser64/vim-illuminate', - branch = 'wrapscan', + 'RRethy/vim-illuminate', + -- commit = '27f6ef135a88d9410a33cf92fc47f5c018df552c', -- for finding the correct color to make highlights config = function() + vim.keymap.set('n', '', require('illuminate').toggle_freeze_buf) + vim.api.nvim_set_hl(0, "IlluminatedWordText", { bg = "#3b4261" }) + vim.api.nvim_set_hl(0, "IlluminatedWordRead", { bg = "#3b4261" }) + vim.api.nvim_set_hl(0, "IlluminatedWordWrite", { bg = "#3b4261" }) require('illuminate').configure({ providers = { 'treesitter', From 22f15d427ed91a3040e2ed88f9e6077ac0a3459c Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:41:18 -0700 Subject: [PATCH 4/9] nvim: remove ifdef-highlighting --- .config/nvim/lua/blake/plugins.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 6e3cb4f..290c933 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -93,9 +93,6 @@ return require('packer').startup({function() vim.cmd 'command! COL ColorizerToggle' end, } - use { -- ifdef-highlighting: highlight c/c++ ifdef's - :Define :Undefine - 'vim-scripts/ifdef-highlighting' - } use { -- lumen: make vim respect the system light/dark theme setting (linux + macos) 'vimpostor/vim-lumen', } From 14a6f1f16878283ef6a69fd319c4cabdd76be065 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:43:32 -0700 Subject: [PATCH 5/9] nvim: un-disable null-ls and add jq for formatting --- .config/nvim/lua/blake/plugins.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 290c933..1b498a7 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -200,14 +200,13 @@ return require('packer').startup({function() } use { -- null-ls: Support for lots of programming tools, but through nvim lsp 'jose-elias-alvarez/null-ls.nvim', - disable = true, - -- requires = { 'nvim-lua/plenary.nvim' }, + requires = { 'nvim-lua/plenary.nvim' }, config = function() local null_ls = require("null-ls") require("null-ls").setup({ sources = { null_ls.builtins.code_actions.refactoring, - null_ls.builtins.formatting.clang_format, + null_ls.builtins.formatting.jq, } }) end From d75eaa24af5b6926038881c72dfc8074faf8c8a0 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:44:19 -0700 Subject: [PATCH 6/9] nvim: re-add targets.vim --- .config/nvim/lua/blake/plugins.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 1b498a7..7f19fb5 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -340,9 +340,9 @@ return require('packer').startup({function() require('blake.other').indent_blankline() end } - -- use { -- targets.vim: fix ci' and other things to work right - -- 'wellle/targets.vim', - -- } + use { -- targets.vim: fix ci' and other things to work better + 'wellle/targets.vim', + } use { -- nvim-tree: File explorer 'kyazdani42/nvim-tree.lua', requires = { 'kyazdani42/nvim-web-devicons' }, From 80ecc7c2ba8b38a3ce7327a3fe6e173eed18d830 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:45:11 -0700 Subject: [PATCH 7/9] nvim: remove cheat.sh-vim (cool, but I didn't use it) --- .config/nvim/lua/blake/plugins.lua | 3 --- 1 file changed, 3 deletions(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 7f19fb5..7c41922 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -444,9 +444,6 @@ return require('packer').startup({function() } end } - use { -- cheat.sh integration - 'dbeniamine/cheat.sh-vim', - } use { -- nvim-align: Align text 'RRethy/nvim-align', } From 32c9cd3c1b696956a9c3aec7dbcd5732eff85d0f Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:45:45 -0700 Subject: [PATCH 8/9] nvim: temporary: swap to own branch of Comment.nvim --- .config/nvim/lua/blake/plugins.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 7c41922..22a4f9c 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -448,7 +448,8 @@ return require('packer').startup({function() 'RRethy/nvim-align', } use { -- comment.nvim: toggle comments - gb and gc - 'numToStr/Comment.nvim', + 'PowerUser64/Comment.nvim', + branch = 'lockmarks', config = function() require('Comment').setup { mappings = { From b439deb468e2549f455bb8d69142ee8182ab0347 Mon Sep 17 00:00:00 2001 From: PowerUser64 Date: Thu, 25 Aug 2022 02:46:41 -0700 Subject: [PATCH 9/9] nvim: add tpope/eunuch --- .config/nvim/lua/blake/plugins.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 22a4f9c..ecf298e 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -556,6 +556,9 @@ return require('packer').startup({function() use { -- tpope: sleuth: automatically get info about files and apply it to vim (tabs vs spaces, etc) 'tpope/vim-sleuth', } + use { -- tpope: eunuch: some unix shell commands in vim + 'tpope/vim-eunuch', + } -- Bootstrap packer if needed { if (Packer_bootstrap) then