From 203378d2662d141451f867c58daa600ed926cc2f Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Fri, 2 Jun 2023 02:52:21 -0700 Subject: [PATCH 1/8] Add folke/tokyonight colorscheme --- init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index fb0252cc654..7df6e796f04 100644 --- a/init.lua +++ b/init.lua @@ -131,10 +131,12 @@ require('lazy').setup({ { -- Theme inspired by Atom - 'navarasu/onedark.nvim', +-- 'navarasu/onedark.nvim', + 'folke/tokyonight.nvim', priority = 1000, config = function() - vim.cmd.colorscheme 'onedark' +-- vim.cmd.colorscheme 'onedark' + vim.cmd.colorscheme 'tokyonight' end, }, From 8d2741d92a19732b230a45b37b11ecd04e9d6210 Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Fri, 2 Jun 2023 05:10:34 -0700 Subject: [PATCH 2/8] Update colorscheme to catppuccin --- init.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 7df6e796f04..c4ecbc7e3e9 100644 --- a/init.lua +++ b/init.lua @@ -132,11 +132,13 @@ require('lazy').setup({ { -- Theme inspired by Atom -- 'navarasu/onedark.nvim', - 'folke/tokyonight.nvim', +-- 'folke/tokyonight.nvim', + 'catppuccin/nvim', name = 'catppuccin', priority = 1000, config = function() -- vim.cmd.colorscheme 'onedark' - vim.cmd.colorscheme 'tokyonight' +-- vim.cmd.colorscheme 'tokyonight' + vim.cmd.colorscheme 'catppuccin' end, }, From 91a5d5eaff27de7ef9aed61fb61b1ef19ee010ea Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Fri, 12 Jan 2024 13:47:38 -0800 Subject: [PATCH 3/8] Update indent-blankline to verion 3 --- init.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/init.lua b/init.lua index c4ecbc7e3e9..0882e193700 100644 --- a/init.lua +++ b/init.lua @@ -161,10 +161,9 @@ require('lazy').setup({ 'lukas-reineke/indent-blankline.nvim', -- Enable `lukas-reineke/indent-blankline.nvim` -- See `:help indent_blankline.txt` - opts = { - char = '┊', - show_trailing_blankline_indent = false, - }, + -- https://github.com/lukas-reineke/indent-blankline.nvim/wiki/Migrate-to-version-3 + main = "ibl", + opts = {}, }, -- "gc" to comment visual regions/lines From 5f2b74e472a944dfa4f58f0701d2c2541fe59f02 Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Fri, 26 Jan 2024 09:15:19 -0800 Subject: [PATCH 4/8] Update to relative line number --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index 0882e193700..e2b9e78e253 100644 --- a/init.lua +++ b/init.lua @@ -216,7 +216,7 @@ require('lazy').setup({ vim.o.hlsearch = false -- Make line numbers default -vim.wo.number = true +vim.wo.relativenumber = true -- Enable mouse mode vim.o.mouse = 'a' From a7adea96de199805bd4c3d658c8b59ffbefb9bf7 Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Wed, 31 Jan 2024 15:03:24 -0800 Subject: [PATCH 5/8] Add syntax highlighting for Terraform --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index e2b9e78e253..c88fb23e2e4 100644 --- a/init.lua +++ b/init.lua @@ -309,7 +309,7 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' }, + ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vimdoc', 'vim' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From e18c181db23f1b95b4e48793fc978c9f0cc29dc3 Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Wed, 30 Oct 2024 00:48:54 -0700 Subject: [PATCH 6/8] Add hcl --- init.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init.lua b/init.lua index c88fb23e2e4..2bcc671d820 100644 --- a/init.lua +++ b/init.lua @@ -309,7 +309,7 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vimdoc', 'vim' }, + ensure_installed = { 'c', 'cpp', 'go', 'hcl', 'lua', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vimdoc', 'vim' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = false, From a6191baef579210f92f36ca64c2fbc5dbe0cb883 Mon Sep 17 00:00:00 2001 From: denzilv Date: Sun, 24 Nov 2024 08:27:35 -0800 Subject: [PATCH 7/8] Set autoinstall to true --- init.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/init.lua b/init.lua index 2bcc671d820..bc556f40435 100644 --- a/init.lua +++ b/init.lua @@ -309,10 +309,10 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'hcl', 'lua', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vimdoc', 'vim' }, + ensure_installed = { 'c', 'cpp', 'go', 'hcl', 'lua', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vim', 'vimdoc' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) - auto_install = false, + auto_install = true, highlight = { enable = true }, indent = { enable = true, disable = { 'python' } }, From a4853b28f67172174f0db2810e24b3b5e290125c Mon Sep 17 00:00:00 2001 From: Denzil Villarico Date: Thu, 25 Jun 2026 14:25:36 -0700 Subject: [PATCH 8/8] Migrate LSP setup for mason-lspconfig v2 and add claudecode.nvim. Replace deprecated setup_handlers with vim.lsp.config(), add the claudecode plugin spec under lua/custom/plugins/, and include nginx and yaml treesitter parsers. Co-authored-by: Cursor --- init.lua | 31 +++++++++++----------- lua/custom/plugins/claudecode.lua | 44 +++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+), 16 deletions(-) create mode 100644 lua/custom/plugins/claudecode.lua diff --git a/init.lua b/init.lua index bc556f40435..2b8faad05a2 100644 --- a/init.lua +++ b/init.lua @@ -309,7 +309,7 @@ vim.keymap.set('n', 'sd', require('telescope.builtin').diagnostics, { de -- See `:help nvim-treesitter` require('nvim-treesitter.configs').setup { -- Add languages to be installed here that you want installed for treesitter - ensure_installed = { 'c', 'cpp', 'go', 'hcl', 'lua', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vim', 'vimdoc' }, + ensure_installed = { 'c', 'cpp', 'go', 'hcl', 'lua', 'nginx', 'python', 'rust', 'terraform', 'tsx', 'typescript', 'vim', 'vimdoc', 'yaml' }, -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) auto_install = true, @@ -446,24 +446,23 @@ local servers = { require('neodev').setup() -- nvim-cmp supports additional completion capabilities, so broadcast that to servers -local capabilities = vim.lsp.protocol.make_client_capabilities() -capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) +local capabilities = require('cmp_nvim_lsp').default_capabilities() --- Ensure the servers above are installed -local mason_lspconfig = require 'mason-lspconfig' +-- mason-lspconfig v2+ uses Neovim's native vim.lsp.config / vim.lsp.enable APIs +vim.lsp.config('*', { + capabilities = capabilities, + on_attach = on_attach, +}) -mason_lspconfig.setup { - ensure_installed = vim.tbl_keys(servers), -} +for server_name, settings in pairs(servers) do + vim.lsp.config(server_name, { + settings = settings, + }) +end -mason_lspconfig.setup_handlers { - function(server_name) - require('lspconfig')[server_name].setup { - capabilities = capabilities, - on_attach = on_attach, - settings = servers[server_name], - } - end, +-- Ensure the servers above are installed (and auto-enabled when installed) +require('mason-lspconfig').setup { + ensure_installed = vim.tbl_keys(servers), } -- [[ Configure nvim-cmp ]] diff --git a/lua/custom/plugins/claudecode.lua b/lua/custom/plugins/claudecode.lua new file mode 100644 index 00000000000..22cd4a1fa7e --- /dev/null +++ b/lua/custom/plugins/claudecode.lua @@ -0,0 +1,44 @@ +return { + "coder/claudecode.nvim", + dependencies = { "folke/snacks.nvim" }, + config = true, + -- `cmd` lets lazy.nvim create command stubs that load the plugin on first use, + -- so `:ClaudeCode` and friends work on a fresh start. Without it, a keys-only + -- spec defers loading until a a* mapping is pressed and the commands + -- would not exist yet. + cmd = { + "ClaudeCode", + "ClaudeCodeFocus", + "ClaudeCodeSelectModel", + "ClaudeCodeAdd", + "ClaudeCodeSend", + "ClaudeCodeTreeAdd", + "ClaudeCodeStatus", + "ClaudeCodeStart", + "ClaudeCodeStop", + "ClaudeCodeOpen", + "ClaudeCodeClose", + "ClaudeCodeDiffAccept", + "ClaudeCodeDiffDeny", + "ClaudeCodeCloseAllDiffs", + }, + keys = { + { "a", nil, desc = "AI/Claude Code" }, + { "ac", "ClaudeCode", desc = "Toggle Claude" }, + { "af", "ClaudeCodeFocus", desc = "Focus Claude" }, + { "ar", "ClaudeCode --resume", desc = "Resume Claude" }, + { "aC", "ClaudeCode --continue", desc = "Continue Claude" }, + { "am", "ClaudeCodeSelectModel", desc = "Select Claude model" }, + { "ab", "ClaudeCodeAdd %", desc = "Add current buffer" }, + { "as", "ClaudeCodeSend", mode = "v", desc = "Send to Claude" }, + { + "as", + "ClaudeCodeTreeAdd", + desc = "Add file", + ft = { "NvimTree", "neo-tree", "oil", "minifiles", "netrw", "snacks_picker_list" }, + }, + -- Diff management + { "aa", "ClaudeCodeDiffAccept", desc = "Accept diff" }, + { "ad", "ClaudeCodeDiffDeny", desc = "Deny diff" }, + }, +}