diff --git a/lazy-lock.json b/lazy-lock.json index 61cadaf..2889220 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,65 +1,66 @@ { "LuaSnip": { "branch": "master", "commit": "b84eeb3641b08324287587b426ec974b888390d9" }, "adwaita.nvim": { "branch": "main", "commit": "c9379097755701ab597140bafd097fbaff3dd517" }, - "aerial.nvim": { "branch": "master", "commit": "e75a3df2c20b3a98c786f5e61587d74a7a6b61d6" }, - "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, + "aerial.nvim": { "branch": "master", "commit": "eeebf32fcb365c860248fee785ae5923831bf2ad" }, + "alpha-nvim": { "branch": "main", "commit": "355fbb81a59637a8963cf5847074f8c44dbef11f" }, "auto-session": { "branch": "main", "commit": "afa735f5923a4c0e8f519ffaa18885dc03922571" }, "baleia.nvim": { "branch": "main", "commit": "fb3aff021b2b64ef820d0230d2c22ebfaf71bb6a" }, "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, - "compile-mode.nvim": { "branch": "latest", "commit": "8608fce76777d01b820ffe355a7881fc74209b82" }, - "conform.nvim": { "branch": "master", "commit": "eff40c4f5fdf7ae8f269b258047d1bd7cee50f02" }, + "compile-mode.nvim": { "branch": "latest", "commit": "609e5e3f6df17f26d36a939344093d03d1f54477" }, + "conform.nvim": { "branch": "master", "commit": "4e97712607bfdcadc097823339599e5bf05f97f9" }, "copilot-cmp": { "branch": "master", "commit": "b6e5286b3d74b04256d0a7e3bd2908eabec34b44" }, "copilot.lua": { "branch": "master", "commit": "86537b286f18783f8b67bccd78a4ef4345679625" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf-lua": { "branch": "main", "commit": "e9413dc2b6e8ab7f62385c972df1dceba483492d" }, + "fzf-lua": { "branch": "main", "commit": "40904abf2bdd784aa789515ce3cd0bc267e5eff4" }, "git-conflict.nvim": { "branch": "main", "commit": "bfd9fe6fba9a161fc199771d85996236a0d0faad" }, - "gitsigns.nvim": { "branch": "main", "commit": "58bd9e98d8e3c5a1c98af312e85247ee1afd3ed2" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, "gruber-darker.nvim": { "branch": "main", "commit": "1793c0929ca965430410f7ec578272a4af9226ee" }, "gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" }, "harpoon": { "branch": "master", "commit": "ccae1b9bec717ae284906b0bf83d720e59d12b91" }, "hybrid.nvim": { "branch": "master", "commit": "8838621a2e299582a0af5b8b96d5515f27b5d058" }, "hydra.nvim": { "branch": "main", "commit": "8578056a2226ed49fc608167edc143a87f75d809" }, - "indent-blankline.nvim": { "branch": "master", "commit": "3fe94b8034dd5241cb882bb73847303b58857ecf" }, + "indent-blankline.nvim": { "branch": "master", "commit": "dddb5d21811c319eb6e51a993d8fb44b193aae3f" }, "kanagawa.nvim": { "branch": "master", "commit": "e5f7b8a804360f0a48e40d0083a97193ee4fcc87" }, "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, "lsp_signature.nvim": { "branch": "master", "commit": "a38da0a61c172bb59e34befc12efe48359884793" }, "lspkind.nvim": { "branch": "master", "commit": "cff4ae321a91ee3473a92ea1a8c637e3a9510aec" }, "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "62360f061d45177dda8afc1b0fd1327328540301" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "1c55991321d1a861537e32446affc5de5d9a6eaf" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "c5e07b8ff54187716334d585db34282e46fa2932" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, - "mini-git": { "branch": "main", "commit": "c5daa5556c1798b6ef6595a3011af3ca5f7a2fd8" }, + "mini-git": { "branch": "main", "commit": "25651b097bedf519421f9744cdc91a693dfa463a" }, "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" }, "mini.bufremove": { "branch": "main", "commit": "1ee294a97e091d3cf967974df622c0d887890dc2" }, "mini.diff": { "branch": "main", "commit": "d58f9cb13400aedc5b5a0ef70fcdf31871ba2ee6" }, "mini.icons": { "branch": "main", "commit": "fe63fe080e76d80713557e5f0c65bc15b14b152d" }, - "mini.indentscope": { "branch": "main", "commit": "1222393d9c5e8d92b913ccab6701a7164b21781c" }, - "mini.statusline": { "branch": "main", "commit": "ec7e2c509c7262fef85a28a772f60ebe146297db" }, + "mini.indentscope": { "branch": "main", "commit": "d2e7b5f0260789c325f92ab3421ff9884ea01842" }, + "mini.statusline": { "branch": "main", "commit": "85014aa9e4afe9a3ff1896ad768bf09584bff574" }, "mini.surround": { "branch": "main", "commit": "57caca9525cec0ea771a67326b0ee637d056078a" }, - "multicursors.nvim": { "branch": "main", "commit": "782820896b1691ed664e4c24f1cd9793dcb33dfb" }, + "multicursors.nvim": { "branch": "main", "commit": "562809aaf203b4c65482a75199166d360f2b9298" }, "neo-tree.nvim": { "branch": "main", "commit": "8c75e8a2949cd6cd35525799200a8d34471ee9eb" }, "neogit": { "branch": "master", "commit": "2b74a777b963dfdeeabfabf84d5ba611666adab4" }, "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, "numb.nvim": { "branch": "master", "commit": "3f7d4a74bd456e747a1278ea1672b26116e0824d" }, - "nvim-autopairs": { "branch": "master", "commit": "e38c5d837e755ce186ae51d2c48e1b387c4425c6" }, + "nvim-autopairs": { "branch": "master", "commit": "48ca9aaee733911424646cb1605f27bc01dedbe3" }, "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, - "nvim-lspconfig": { "branch": "master", "commit": "6c505d4220b521f3b0e7b645f6ce45fa914d0eed" }, + "nvim-lspconfig": { "branch": "master", "commit": "a89de2e049b5f89a0ee55029d5a31213bd4de6f8" }, "nvim-osc52": { "branch": "main", "commit": "04cfaba1865ae5c53b6f887c3ca7304973824fb2" }, - "nvim-treesitter": { "branch": "master", "commit": "e28614cb1a5712166afef80081f68c28db92e3e0" }, + "nvim-spectre": { "branch": "master", "commit": "ba7fb777edff6c1fbbeffd343e113af64c04e90a" }, + "nvim-treesitter": { "branch": "master", "commit": "59cc5f35656f97bc964229e3ec5066a7b5a8ee5b" }, "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "oil.nvim": { "branch": "master", "commit": "fcca212c2e966fc3dec1d4baf888e670631d25d1" }, - "outline.nvim": { "branch": "main", "commit": "2175b6da5b7b5be9de14fd3f54383a17f5e4609c" }, + "outline.nvim": { "branch": "main", "commit": "b47514b8f4ae3207c499a69eec05c29cf2182af8" }, "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "a727bd368e70808125b7cf589328cc595faf3d5a" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "c097f728a409d9923a3c70c1507e8389978a9b85" }, "readline.nvim": { "branch": "main", "commit": "5cb27349bc01cdcdb3d3494e5337d8b3834aef1a" }, - "render-markdown.nvim": { "branch": "main", "commit": "420058baa6e33f20c096c93bb1df52bc841d9475" }, + "render-markdown.nvim": { "branch": "main", "commit": "7986be47531d652e950776536987e01dd5b55b94" }, "resession.nvim": { "branch": "master", "commit": "e087ebeef81df25a12fcc4ec067ca73e2bb54c4a" }, "scope.nvim": { "branch": "main", "commit": "5e3f5ead970317b2f276d38dc031cb4bc5742cd4" }, "sg.nvim": { "branch": "master", "commit": "8bdd4d19da2268072708d5fe18fda9c23e16509d" }, diff --git a/lua/rayandrew/plugins/fzf.lua b/lua/rayandrew/plugins/fzf.lua index 46961a6..2edb552 100644 --- a/lua/rayandrew/plugins/fzf.lua +++ b/lua/rayandrew/plugins/fzf.lua @@ -24,7 +24,7 @@ return { vim.keymap.set('n', 'ss', fzf.builtin, { desc = '[S]earch [S]elect' }) vim.keymap.set('n', 'sg', fzf.live_grep, { desc = '[S]earch by [G]rep' }) vim.keymap.set('n', 'sd', fzf.diagnostics_document, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', fzf.resume, { desc = '[S]earch [R]esume' }) + -- vim.keymap.set('n', 'sr', fzf.resume, { desc = '[S]earch [R]esume' }) vim.keymap.set('n', 's.', fzf.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) vim.keymap.set('n', '', fzf.buffers, { desc = '[ ] Find existing buffers' }) vim.keymap.set('n', 'sh', fzf.helptags, { desc = '[S]earch [H]elp' }) diff --git a/lua/rayandrew/plugins/neo-tree.lua b/lua/rayandrew/plugins/neo-tree.lua index 31a74bb..092fa8b 100644 --- a/lua/rayandrew/plugins/neo-tree.lua +++ b/lua/rayandrew/plugins/neo-tree.lua @@ -4,6 +4,7 @@ return { 'nvim-neo-tree/neo-tree.nvim', version = '*', + cond = false, dependencies = { 'nvim-lua/plenary.nvim', 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended diff --git a/lua/rayandrew/plugins/oil.lua b/lua/rayandrew/plugins/oil.lua index 658c9ea..e3590f1 100644 --- a/lua/rayandrew/plugins/oil.lua +++ b/lua/rayandrew/plugins/oil.lua @@ -22,6 +22,23 @@ return { keymaps = { ['g?'] = 'actions.show_help', [''] = 'actions.select', + [''] = { + callback = function() + require('oil.actions').yank_entry.callback() + local filepath = vim.fn.getreg(vim.v.register) + vim.fn.setreg('+', filepath) + vim.notify('Copied: ' .. filepath) + end, + }, + [''] = { + callback = function() + require('oil.actions').yank_entry.callback() + local filepath = vim.fn.getreg(vim.v.register) + filepath = vim.fn.fnamemodify(filepath, ':.') + vim.fn.setreg('+', filepath) + vim.notify('Copied: ' .. filepath) + end, + }, -- [''] = { 'actions.select', opts = { vertical = true }, desc = 'Open the entry in a vertical split' }, -- [''] = { 'actions.select', opts = { horizontal = true }, desc = 'Open the entry in a horizontal split' }, [''] = { 'actions.select', opts = { tab = true }, desc = 'Open the entry in new tab' }, diff --git a/lua/rayandrew/plugins/spectre.lua b/lua/rayandrew/plugins/spectre.lua new file mode 100644 index 0000000..9ea3a59 --- /dev/null +++ b/lua/rayandrew/plugins/spectre.lua @@ -0,0 +1,13 @@ +return { + { + 'nvim-pack/nvim-spectre', + lazy = true, + config = true, + keys = { + { 'pt', 'lua require("spectre").toggle()', desc = 'Spectre [T]oggle' }, + { 'pw', 'lua require("spectre").open_visual({select_word = true})', desc = 'Spectre Current [W]ord', mode = 'n' }, + { 'pw', 'lua require("spectre").open_visual()', desc = 'Spectre Current [W]ord', mode = 'v' }, + { 'pf', 'lua require("spectre").open_file_search({select_word = true})', desc = 'Spectre Current [F]ile' }, + }, + }, +}