From e288fd2a73df1996de456912ed9d28afe464f516 Mon Sep 17 00:00:00 2001 From: Tom Kendrick Date: Tue, 17 Mar 2026 11:50:09 +0000 Subject: [PATCH] foo --- nvim/.config/nvim/init.lua | 4 -- nvim/.config/nvim/lazy-lock.json | 29 ++++++------ .../nvim/lua/custom/plugins/catppuccin.lua | 10 ++-- .../nvim/lua/custom/plugins/codecompanion.lua | 23 --------- .../nvim/lua/custom/plugins/copilot-vim.lua | 8 ---- .../nvim/lua/custom/plugins/kulala.lua | 21 +++++++++ .../nvim/lua/custom/plugins/lspconfig.lua | 7 ++- .../lua/custom/plugins/{octo.lua => octo.bak} | 0 .../nvim/lua/custom/plugins/opencode.lua | 47 +++++++++++++++++++ .../nvim/lua/custom/plugins/overseer.lua | 6 +++ 10 files changed, 100 insertions(+), 55 deletions(-) delete mode 100644 nvim/.config/nvim/lua/custom/plugins/codecompanion.lua delete mode 100644 nvim/.config/nvim/lua/custom/plugins/copilot-vim.lua create mode 100644 nvim/.config/nvim/lua/custom/plugins/kulala.lua rename nvim/.config/nvim/lua/custom/plugins/{octo.lua => octo.bak} (100%) create mode 100644 nvim/.config/nvim/lua/custom/plugins/opencode.lua create mode 100644 nvim/.config/nvim/lua/custom/plugins/overseer.lua diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 3add8c2..ec8ac6c 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -165,10 +165,6 @@ require('lazy').setup({ -- In normal mode type `sh` then write `lazy.nvim-plugin` -- you can continue same window with `sr` which resumes last telescope search }, { - git = { - throttle = { enabled = true, rate = 2, duration = 5 * 1000 }, - }, - ui = { -- If you are using a Nerd Font: set icons to an empty table which will use the -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index 17671a1..cbe05a3 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -4,36 +4,37 @@ "alpha-nvim": { "branch": "main", "commit": "3979b01cb05734331c7873049001d3f2bb8477f4" }, "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" }, "blink.cmp": { "branch": "main", "commit": "b19413d214068f316c78978b08264ed1c41830ec" }, - "codecompanion.nvim": { "branch": "main", "commit": "b3bb0d73079643d4a5b0d8b621cde619a73bc91a" }, - "conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" }, + "conform.nvim": { "branch": "master", "commit": "8314f4c9e205e7f30b62147069729f9a1227d8bf" }, "copilot.lua": { "branch": "master", "commit": "e78d1ffebdf6ccb6fd8be4e6898030c1cf5f9b64" }, - "copilot.vim": { "branch": "release", "commit": "f89e977c87180519ba3b942200e3d05b17b1e2fc" }, "diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" }, "fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" }, - "gitsigns.nvim": { "branch": "main", "commit": "5813e4878748805f1518cee7abb50fd7205a3a48" }, + "gitsigns.nvim": { "branch": "main", "commit": "dfac404ac94b0eb1461bd7da32279e16950dfd67" }, "guess-indent.nvim": { "branch": "main", "commit": "84a4987ff36798c2fc1169cbaff67960aed9776f" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, + "kulala.nvim": { "branch": "main", "commit": "cd3eaa83b8d60533837202dede73238334d71832" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, "lazydev.nvim": { "branch": "main", "commit": "5231c62aa83c2f8dc8e7ba957aa77098cda1257d" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "8f1a3e6eecb638817e8999aaa16ada27cd54d867" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "4cfe411526a7a99c18281135e8b4765ae6330d15" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, - "mini.nvim": { "branch": "main", "commit": "6170f606fbdb94bf461635c47962f61dceffe496" }, + "mini.nvim": { "branch": "main", "commit": "fb4ccfed03c1f0d9db702f93a65cb4c0c6c2832b" }, "neogit": { "branch": "master", "commit": "d8bf9102692250193b855acd9025a826f1af2729" }, "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" }, - "neotest-vitest": { "branch": "main", "commit": "8bc784d319889a39c7ed8045ff7b0f12770c7b54" }, - "nvim": { "branch": "main", "commit": "ce8d176faa4643e026e597ae3c31db59b63cef09" }, - "nvim-lspconfig": { "branch": "master", "commit": "d20d83b3f24f5884da73a9fc92fdc47e778b8d0d" }, + "neotest-vitest": { "branch": "main", "commit": "f01addc6f07b79ef1be5f4297eafbee9e0959018" }, + "nvim-lspconfig": { "branch": "master", "commit": "0b38bc74487e73489624d61396af7805af9cc75f" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "main", "commit": "6e42d823ce0a5a76180c473c119c7677738a09d1" }, + "nvim-treesitter": { "branch": "main", "commit": "b033ab331ca0bccbd93c3c2b4f886fdfc09abec0" }, "nvim-ufo": { "branch": "main", "commit": "72d54c31079d38d8dfc5456131b1d0fb5c0264b0" }, "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, - "octo.nvim": { "branch": "master", "commit": "09ff70efd885fe1cdf62505dce3a9bc6baeb85e1" }, - "oil.nvim": { "branch": "master", "commit": "756dec855b4811f2d27f067a3aca477f368d99f5" }, + "oil.nvim": { "branch": "master", "commit": "81b8a91735ad5cd24a6b3137f14a89f19176364f" }, + "opencode.nvim": { "branch": "main", "commit": "364c7336562329f6c901629710070ea6ae256e3b" }, + "orng.nvim": { "branch": "main", "commit": "bbe4c260ffebe4f80968273c9fab6fcb672bffb3" }, + "overseer.nvim": { "branch": "master", "commit": "5828bdbd86677497613033c142f0a8624489216f" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, + "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c" }, "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, - "telescope.nvim": { "branch": "master", "commit": "e709d31454ee6e6157f0537f861f797bd44c0bad" }, + "telescope.nvim": { "branch": "master", "commit": "3333a52ff548ba0a68af6d8da1e54f9cd96e9179" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" } diff --git a/nvim/.config/nvim/lua/custom/plugins/catppuccin.lua b/nvim/.config/nvim/lua/custom/plugins/catppuccin.lua index f86e19b..06df8ab 100644 --- a/nvim/.config/nvim/lua/custom/plugins/catppuccin.lua +++ b/nvim/.config/nvim/lua/custom/plugins/catppuccin.lua @@ -1,15 +1,15 @@ return { { - 'catppuccin/nvim', + 'roerohan/orng.nvim', lazy = false, - name = catppuccin, priority = 1000, config = function() - require('catppuccin').setup { + require('orng').setup { + variant = 'dark', transparent = true, - flavour = 'mocha', + italic_comment = false, } - vim.cmd.colorscheme 'catppuccin' + vim.cmd.colorscheme 'orng' end, }, } diff --git a/nvim/.config/nvim/lua/custom/plugins/codecompanion.lua b/nvim/.config/nvim/lua/custom/plugins/codecompanion.lua deleted file mode 100644 index 39002b7..0000000 --- a/nvim/.config/nvim/lua/custom/plugins/codecompanion.lua +++ /dev/null @@ -1,23 +0,0 @@ -return { - { - 'olimorris/codecompanion.nvim', - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-treesitter/nvim-treesitter', - }, - strategies = { - chat = { - adapter = { - name = 'opencode', - model = 'claude-sonnet-4', - }, - }, - }, - opts = { - -- NOTE: The log_level is in `opts.opts` - opts = { - log_level = 'DEBUG', -- or "TRACE" - }, - }, - }, -} diff --git a/nvim/.config/nvim/lua/custom/plugins/copilot-vim.lua b/nvim/.config/nvim/lua/custom/plugins/copilot-vim.lua deleted file mode 100644 index 26ce044..0000000 --- a/nvim/.config/nvim/lua/custom/plugins/copilot-vim.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - 'github/copilot.vim', - config = function() - vim.g.copilot_enabled = false - end, - }, -} diff --git a/nvim/.config/nvim/lua/custom/plugins/kulala.lua b/nvim/.config/nvim/lua/custom/plugins/kulala.lua new file mode 100644 index 0000000..4ea3b12 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/kulala.lua @@ -0,0 +1,21 @@ +return { + 'mistweaverco/kulala.nvim', + keys = { + { 'Rs', desc = 'Send request' }, + { 'Ra', desc = 'Send all requests' }, + { 'Rb', desc = 'Open scratchpad' }, + }, + ft = { 'http', 'rest' }, + config = function(_, opts) + require('kulala').setup { + -- Global headers applied to every request + global_headers = { + ['Authorization'] = 'Bearer {{login.response.body.access_token}}', + ['Content-Type'] = 'application/json', + }, + global_keymaps = true, + global_keymaps_prefix = 'R', + kulala_keymaps_prefix = '', + } + end, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua b/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua index 01e124d..c40d9e0 100644 --- a/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua +++ b/nvim/.config/nvim/lua/custom/plugins/lspconfig.lua @@ -11,7 +11,7 @@ return { 'WhoIsSethDaniel/mason-tool-installer.nvim', -- Useful status updates for LSP. - { 'j-hui/fidget.nvim', opts = {} }, + { 'j-hui/fidget.nvim', opts = {} }, -- Allows extra capabilities provided by blink.cmp 'saghen/blink.cmp', @@ -209,6 +209,11 @@ return { -- vtsls = {}, + -- tsgo = { + -- cmd = { 'tsgo', '--lsp', '--stdio' }, + -- filetypes = { 'typescript', 'typescriptreact', 'javascript', 'javascriptreact' }, + -- root_markers = { 'tsconfig.json', 'package.json', '.git' }, + -- }, lua_ls = { -- cmd = { ... }, -- filetypes = { ... }, diff --git a/nvim/.config/nvim/lua/custom/plugins/octo.lua b/nvim/.config/nvim/lua/custom/plugins/octo.bak similarity index 100% rename from nvim/.config/nvim/lua/custom/plugins/octo.lua rename to nvim/.config/nvim/lua/custom/plugins/octo.bak diff --git a/nvim/.config/nvim/lua/custom/plugins/opencode.lua b/nvim/.config/nvim/lua/custom/plugins/opencode.lua new file mode 100644 index 0000000..d55cf2c --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/opencode.lua @@ -0,0 +1,47 @@ +return { + 'NickvanDyke/opencode.nvim', + dependencies = { + -- Recommended for `ask()` and `select()`. + -- Required for `snacks` provider. + ---@module 'snacks' <- Loads `snacks.nvim` types for configuration intellisense. + { 'folke/snacks.nvim', opts = { input = {}, picker = {}, terminal = {} } }, + }, + config = function() + ---@type opencode.Opts + vim.g.opencode_opts = { + -- Your configuration, if any — see `lua/opencode/config.lua`, or "goto definition" on the type or field. + } + + -- Required for `opts.events.reload`. + vim.o.autoread = true + + -- Recommended/example keymaps. + vim.keymap.set({ 'n', 'x' }, '', function() + require('opencode').ask('@this: ', { submit = true }) + end, { desc = 'Ask opencode…' }) + vim.keymap.set({ 'n', 'x' }, '', function() + require('opencode').select() + end, { desc = 'Execute opencode action…' }) + vim.keymap.set({ 'n', 't' }, '', function() + require('opencode').toggle() + end, { desc = 'Toggle opencode' }) + + vim.keymap.set({ 'n', 'x' }, 'go', function() + return require('opencode').operator '@this ' + end, { desc = 'Add range to opencode', expr = true }) + vim.keymap.set('n', 'goo', function() + return require('opencode').operator '@this ' .. '_' + end, { desc = 'Add line to opencode', expr = true }) + + vim.keymap.set('n', '', function() + require('opencode').command 'session.half.page.up' + end, { desc = 'Scroll opencode up' }) + vim.keymap.set('n', '', function() + require('opencode').command 'session.half.page.down' + end, { desc = 'Scroll opencode down' }) + + -- You may want these if you stick with the opinionated "" and "" above — otherwise consider "o…". + vim.keymap.set('n', '+', '', { desc = 'Increment under cursor', noremap = true }) + vim.keymap.set('n', '-', '', { desc = 'Decrement under cursor', noremap = true }) + end, +} diff --git a/nvim/.config/nvim/lua/custom/plugins/overseer.lua b/nvim/.config/nvim/lua/custom/plugins/overseer.lua new file mode 100644 index 0000000..faa88d3 --- /dev/null +++ b/nvim/.config/nvim/lua/custom/plugins/overseer.lua @@ -0,0 +1,6 @@ +return { + 'stevearc/overseer.nvim', + ---@module 'overseer' + ---@type overseer.SetupOpts + opts = {}, +}