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' diff --git a/.config/nvim/lua/blake/plugins.lua b/.config/nvim/lua/blake/plugins.lua index 1d1d486..a333f4c 100644 --- a/.config/nvim/lua/blake/plugins.lua +++ b/.config/nvim/lua/blake/plugins.lua @@ -93,18 +93,17 @@ 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', } 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', @@ -201,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 @@ -294,13 +292,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', @@ -349,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' }, @@ -453,14 +444,12 @@ return require('packer').startup({function() } end } - use { -- cheat.sh integration - 'dbeniamine/cheat.sh-vim', - } use { -- nvim-align: Align text '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 = { @@ -567,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