From 3fe668252b4ba538b7495941ccb5549da81243fc Mon Sep 17 00:00:00 2001 From: Simon Lasbrugnas Date: Mon, 4 Aug 2025 01:53:36 +0200 Subject: [PATCH] chore: update config --- lazy-lock.json | 29 +++++++++++++++-------------- lua/custom/lsp/config.lua | 2 -- lua/custom/lsp/config/ts_ls.lua | 6 ++++++ lua/custom/plugins/avante.lua | 3 +++ lua/custom/plugins/colorscheme.lua | 22 ++++++++++++++++------ lua/custom/plugins/conform.lua | 17 +++++++++++++---- lua/custom/plugins/oil.lua | 1 + lua/custom/typescript-tools.lua | 2 +- 8 files changed, 55 insertions(+), 27 deletions(-) create mode 100644 lua/custom/lsp/config/ts_ls.lua diff --git a/lazy-lock.json b/lazy-lock.json index e5db3fa..2253207 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,7 +1,7 @@ { "Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" }, - "LuaSnip": { "branch": "master", "commit": "3d5bced1b9ae69fa3f9b1942e28af5dbc537f946" }, - "avante.nvim": { "branch": "main", "commit": "5e4eb8652b4776f139282a343f04a3a8c7f23cb0" }, + "LuaSnip": { "branch": "master", "commit": "de10d8414235b0a8cabfeba60d07c24304e71f5c" }, + "avante.nvim": { "branch": "main", "commit": "66cfbb4c190da1b558c0e2f6dda59b89002f0c24" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" }, @@ -9,44 +9,45 @@ "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, "conform.nvim": { "branch": "master", "commit": "973f3cb73887d510321653044791d7937c7ec0fa" }, "dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" }, - "evergarden": { "branch": "mega", "commit": "f8bda159eb756bd615d250aae819459b55b30399" }, + "evergarden": { "branch": "main", "commit": "d93798f679c914c635d6a5a9b16a8a481b7c0779" }, "fleet-theme-nvim": { "branch": "master", "commit": "45c300c31485def326db00d9c857760d50e5c728" }, "format-ts-errors.nvim": { "branch": "main", "commit": "4b7418d6689bc0fd3c1db0500c67133422522384" }, "github-nvim-theme": { "branch": "main", "commit": "c106c9472154d6b2c74b74565616b877ae8ed31d" }, - "gitsigns.nvim": { "branch": "main", "commit": "b01433169be710d6c69f7b4ee264d9670698b831" }, + "gitsigns.nvim": { "branch": "main", "commit": "8270378ab83540b03d09c0194ba3e208f9d0cb72" }, "go.nvim": { "branch": "master", "commit": "28d9618bfe4385d3af60fed15a4c9f9445ae1f10" }, - "gruvbox.nvim": { "branch": "main", "commit": "58a2cda2e953a99e2f87c12b7fb4602da4e0709c" }, + "gruvbox": { "branch": "master", "commit": "697c00291db857ca0af00ec154e5bd514a79191f" }, "img-clip.nvim": { "branch": "main", "commit": "d8b6b030672f9f551a0e3526347699985a779d93" }, "indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" }, "lackluster.nvim": { "branch": "main", "commit": "b247a6f51cb43e49f3f753f4a59553b698bf5438" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lsp-zero.nvim": { "branch": "v4.x", "commit": "d388e2b71834c826e61a3eba48caec53d7602510" }, - "lsp_signature.nvim": { "branch": "master", "commit": "d9c39937e4e0977357530e988aa8940078bb231f" }, + "lsp_signature.nvim": { "branch": "master", "commit": "62cadce83aaceed677ffe7a2d6a57141af7131ea" }, "lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" }, "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, "lush.nvim": { "branch": "main", "commit": "1be16d9002f8b2e8973a19ceac199ad394dea76a" }, "luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "f2fa60409630ec2d24acf84494fb55e1d28d593c" }, - "mason.nvim": { "branch": "main", "commit": "3671ab0d40aa5bd24b1686562bd0a23391ecf76a" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "844d247d998c2f9a6a3baad8bb9748edc55ce69f" }, + "mason.nvim": { "branch": "main", "commit": "9e25c98d4826998460926f8c5c2284848d80ae89" }, "mellow.nvim": { "branch": "main", "commit": "3894d0d3238a8941f242b88baf3d1cbdb447282e" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, "nightfox.nvim": { "branch": "main", "commit": "ba47d4b4c5ec308718641ba7402c143836f35aa9" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, - "nvim-lint": { "branch": "master", "commit": "9c6207559297b24f0b7c32829f8e45f7d65b991f" }, - "nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" }, + "nvim-lint": { "branch": "master", "commit": "7ef127aaede2a4d5ad8df8321e2eb4e567f29594" }, + "nvim-lspconfig": { "branch": "master", "commit": "63a38440989c58e1f100373ab603fd24665bdc9a" }, "nvim-tree.lua": { "branch": "master", "commit": "65bae449224b8a3bc149471b96587b23b13a9946" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "02fd97c803962108d129cf42e05adc5eff7f89c1" }, + "nvim-treesitter-context": { "branch": "master", "commit": "6853ecb2cd8b062365da1cdd1a2e6f934ad55ed6" }, "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "4a8369f4c78ef6f6f895f0cec349e48f74330574" }, + "nvim-web-devicons": { "branch": "master", "commit": "3362099de3368aa620a8105b19ed04c2053e38c0" }, "oil.nvim": { "branch": "master", "commit": "bbad9a76b2617ce1221d49619e4e4b659b3c61fc" }, - "oxocarbon.nvim": { "branch": "main", "commit": "1dc7b7ea9df60edd9547b667fd1f789ce9f028fb" }, + "oldbook-theme": { "branch": "main", "commit": "750f124e25be9a9031691ceffeb2868cb08d6910" }, + "oxocarbon.nvim": { "branch": "main", "commit": "b1aca1d6843b3eed1c4500ad5b106646375bd726" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "rasmus.nvim": { "branch": "main", "commit": "49f7ee7bf3eb00db52c77f84b15bc69f318bafc1" }, - "render-markdown.nvim": { "branch": "main", "commit": "9e51b7711c6159511e966dc42fafd58a9db9ad1d" }, + "render-markdown.nvim": { "branch": "main", "commit": "eec00fbfd7273cdfa0a1154dbef0bb983641eaf8" }, "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, "telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" }, diff --git a/lua/custom/lsp/config.lua b/lua/custom/lsp/config.lua index d661dce..bd150b8 100644 --- a/lua/custom/lsp/config.lua +++ b/lua/custom/lsp/config.lua @@ -39,6 +39,4 @@ lsp_zero.on_attach(function(_, bufnr) vim.keymap.set("n", "gi", function() vim.lsp.buf.implementation() end, opts) vim.keymap.set("n", "gr", function() vim.lsp.buf.references() end, opts) vim.keymap.set("n", "rn", function() vim.lsp.buf.rename() end, opts) - vim.keymap.set("n", "D", function() vim.lsp.buf.type_definition() end, opts) - vim.keymap.set("n", "", function() vim.lsp.buf.format() end, opts) end) diff --git a/lua/custom/lsp/config/ts_ls.lua b/lua/custom/lsp/config/ts_ls.lua new file mode 100644 index 0000000..2e27c32 --- /dev/null +++ b/lua/custom/lsp/config/ts_ls.lua @@ -0,0 +1,6 @@ +return { + on_attach = function(client, _) + -- Just want ts_ls in path, I don't want it to do anything + client.stop() + end +} diff --git a/lua/custom/plugins/avante.lua b/lua/custom/plugins/avante.lua index 67b90af..fdc891e 100644 --- a/lua/custom/plugins/avante.lua +++ b/lua/custom/plugins/avante.lua @@ -2,6 +2,9 @@ return { "yetone/avante.nvim", lazy = false, priority = 10, + keys = { + { "an", "AvanteChatNew", desc = "Avante New Chat" }, + }, opts = { providers = { openai = { diff --git a/lua/custom/plugins/colorscheme.lua b/lua/custom/plugins/colorscheme.lua index 16ef198..477f5c8 100644 --- a/lua/custom/plugins/colorscheme.lua +++ b/lua/custom/plugins/colorscheme.lua @@ -37,7 +37,7 @@ return { end }, { - 'comfysage/evergarden', + "comfysage/evergarden", opts = {}, lazy = false, priority = 1000, @@ -64,17 +64,17 @@ return { -- vim.cmd("hi Normal guibg=NONE") end }, - { - 'ellisonleao/gruvbox.nvim', - opts = {}, +{ + "morhetz/gruvbox", lazy = false, priority = 1000, init = function() + -- vim.o.background = "light" -- vim.cmd("colorscheme gruvbox") end }, { - 'EdenEast/nightfox.nvim', + "EdenEast/nightfox.nvim", opts = {}, lazy = false, priority = 1000, @@ -83,11 +83,21 @@ return { end }, { - 'nyoom-engineering/oxocarbon.nvim', + "nyoom-engineering/oxocarbon.nvim", lazy = false, priority = 1000, init = function() -- vim.cmd("colorscheme oxocarbon") end }, + { + "gko/oldbook-theme", + lazy = false, + priority = 1000, + init = function() + -- vim.o.background = "light" + -- vim.cmd("colorscheme oldbook") + end + } + } diff --git a/lua/custom/plugins/conform.lua b/lua/custom/plugins/conform.lua index 4b7a4b6..8cb3f57 100644 --- a/lua/custom/plugins/conform.lua +++ b/lua/custom/plugins/conform.lua @@ -4,11 +4,11 @@ return { require("conform").setup({ formatters_by_ft = { go = { "go" }, - html = { "biome", "html-lsp" }, + html = { "biome", "html-lsp", "eslint" }, yaml = { "prettier" }, - javascript = { "biome" }, - javascriptreact = { "biome" }, - markdown = { "biome" }, + css = { "eslint" }, + javascript = { "biome", "eslint" }, + javascriptreact = { "biome", "eslint" }, typescript = { "biome" }, typescriptreact = { "biome" }, ["*"] = { "trim_whitespace" }, @@ -34,5 +34,14 @@ return { timeout_ms = 500, }, }) + + -- Add keybinding for manual formatting + vim.keymap.set({ "n", "v" }, "", function() + require("conform").format({ + lsp_fallback = true, + async = false, + timeout_ms = 1000, + }) + end, { desc = "Format file or range (in visual mode)" }) end, } diff --git a/lua/custom/plugins/oil.lua b/lua/custom/plugins/oil.lua index 0a9de73..2a68e94 100644 --- a/lua/custom/plugins/oil.lua +++ b/lua/custom/plugins/oil.lua @@ -9,6 +9,7 @@ return { end require("oil").setup { + delete_to_trash = true, columns = { "icon" }, keymaps = { ["g?"] = "actions.show_help", diff --git a/lua/custom/typescript-tools.lua b/lua/custom/typescript-tools.lua index 1cf4a84..39e8ac7 100644 --- a/lua/custom/typescript-tools.lua +++ b/lua/custom/typescript-tools.lua @@ -5,7 +5,7 @@ require("typescript-tools").setup { client.server_capabilities.documentRangeFormattingProvider = false -- run the current go file in a vertical split terminal pane - vim.keymap.set("n", "", "vsplit term://bun %") + vim.keymap.set("n", "", "vsplit term://npx tsx %") -- open the Go scratchpad vim.keymap.set("n", "q", "e ~/personal/Node/test/main.ts") end,