From 2ea28a4253830ae0f6df9458e9f374d6d3289249 Mon Sep 17 00:00:00 2001 From: Ward Truyen Date: Sun, 20 Jul 2025 14:40:45 +0200 Subject: [PATCH] chore: format + mason fix --- lua/ward/init.lua | 3 +++ lua/ward/plugins/lsp-config.lua | 1 + lua/ward/plugins/mason.lua | 2 +- lua/ward/plugins/nvim-tree.lua | 15 +++++++++++++++ 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/lua/ward/init.lua b/lua/ward/init.lua index 1d62c33..0d9c003 100644 --- a/lua/ward/init.lua +++ b/lua/ward/init.lua @@ -13,4 +13,7 @@ if vim.g.neovide then vim.g.neovide_opacity = 0.7 vim.g.neovide_window_blurred = true vim.o.guifont = "Source Code Pro:h14" + -- vim.keymap.set({ "i", "c" }, "", '+', { desc = "Paste system clipboard" }) + -- vim.keymap.set({ "n", "x" }, "", '"+y', { desc = "Copy system clipboard" }) + -- vim.keymap.set({ "n", "x" }, "", '"+p', { desc = "Paste system clipboard" }) end diff --git a/lua/ward/plugins/lsp-config.lua b/lua/ward/plugins/lsp-config.lua index 63f1975..a3d793a 100644 --- a/lua/ward/plugins/lsp-config.lua +++ b/lua/ward/plugins/lsp-config.lua @@ -140,6 +140,7 @@ return { require("telescope.builtin").lsp_dynamic_workspace_symbols, "[W]orkspace symbols" ) + map("li", vim.cmd.LspInfo, "Show lsp info") map("lp", vim.diagnostic.goto_prev, "Go to [P]revious diagnostic message") map("ln", vim.diagnostic.goto_next, "Go to [N]ext diagnostic message") diff --git a/lua/ward/plugins/mason.lua b/lua/ward/plugins/mason.lua index 5cb0455..db89616 100644 --- a/lua/ward/plugins/mason.lua +++ b/lua/ward/plugins/mason.lua @@ -7,7 +7,7 @@ return { opts = {}, dependencies = { { - "williamboman/mason.nvim", + "mason-org/mason.nvim", config = function() require("mason").setup() end, diff --git a/lua/ward/plugins/nvim-tree.lua b/lua/ward/plugins/nvim-tree.lua index 5f73f8b..3072393 100644 --- a/lua/ward/plugins/nvim-tree.lua +++ b/lua/ward/plugins/nvim-tree.lua @@ -19,6 +19,21 @@ return { filters = { git_ignored = false, }, + on_attach = function(bufnr) + local api = require "nvim-tree.api" + + local function opts(desc) + return { desc = "nvim-tree: " .. desc, buffer = bufnr, noremap = true, silent = true, nowait = true } + end + + -- default mappings + api.config.mappings.default_on_attach(bufnr) + + -- custom mappings + vim.keymap.set('n', '', vim.cmd.NvimTreeClose, opts('Close Explorer')) + -- vim.keymap.set('n', '', api.tree.change_root_to_parent, opts('Up')) + vim.keymap.set('n', '?', api.tree.toggle_help, opts('Help')) + end, }) vim.keymap.set("n", "e", vim.cmd.NvimTreeToggle) vim.api.nvim_create_autocmd({ "QuitPre" }, { callback = function() vim.cmd("NvimTreeClose") end, })