diff --git a/init.lua b/init.lua index 17cb429..f9b55cc 100644 --- a/init.lua +++ b/init.lua @@ -159,6 +159,7 @@ require("lazy").setup({ { "mxsdev/nvim-dap-vscode-js", ft = "javascript" }, { "akinsho/flutter-tools.nvim", ft = "dart" }, { "nvimdev/lspsaga.nvim", event = "LspAttach" }, + { "Wansmer/treesj", event = "LspAttach" }, { "is0n/jaq-nvim", event = "LspAttach" }, { "j-hui/fidget.nvim", config = true, event = "LspAttach" }, { "sainnhe/edge", event = "VeryLazy" }, @@ -323,8 +324,8 @@ vim.keymap.set("n", "b", "Telescope buffers") vim.keymap.set("n", "h", "Telescope help_tags") vim.keymap.set("n", "y", "Telescope registers") vim.keymap.set("n", "n", "Telescope lsp_references") -vim.keymap.set("n", "m", "Telescope diagnostics") -vim.keymap.set("n", "x", "Telescope lsp_document_symbols") +vim.keymap.set("n", "j", "Telescope diagnostics") +vim.keymap.set("n", "s", "Telescope lsp_document_symbols") vim.keymap.set("n", "f", "Telescope file_browser") local fb_actions = require("telescope").extensions.file_browser.actions @@ -369,11 +370,9 @@ local on_attach = function(client, bufnr) client.server_capabilities.documentFormattingProvider = false local set = vim.keymap.set set("n", "K", "Lspsaga hover_doc") - set("n", "1", "Lspsaga finder") set("n", "r", "Lspsaga rename") set("n", "c", "Lspsaga code_action") set("n", "e", "Lspsaga show_line_diagnostics") - set("n", "5", "Lspsaga peek_definition") set("n", "[", "Lspsaga diagnostic_jump_prev") set("n", "]", "Lspsaga diagnostic_jump_next") end @@ -522,8 +521,8 @@ require("jaq-nvim").setup({ sh = "sh %", ruby = "ruby %", php = "php %", - go = "go run %", - javascript = "node %" + go = "go run %", + javascript = "node %", }, }, @@ -558,7 +557,7 @@ require("jaq-nvim").setup({ }, }) -vim.keymap.set("n", "j", ":Jaq", { silent = true }) +vim.keymap.set("n", "x", ":Jaq", { silent = true }) --nvim-cmp local cmp = require("cmp") @@ -658,6 +657,13 @@ vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagn update_in_insert = true, }) +-- treesj +local tsj = require("treesj") +tsj.setup({ + use_default_keymaps = false, +}) +vim.keymap.set("n", "m", require("treesj").toggle) + --rainbow-delimiters require("rainbow-delimiters.setup").setup()