From 6b2f48285a774aca8049edb7085b230fae1cd99c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sascha=20L=C3=BCdecke?= Date: Mon, 9 Sep 2024 13:24:42 +0200 Subject: [PATCH] Dropped duplicate lsp keybindings, added desc to fzf-lua ones --- lua/keybindings.lua | 23 ++++++++--------------- lua/plugins.lua | 16 ++++++++++++++++ 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/lua/keybindings.lua b/lua/keybindings.lua index 2a99578..d1da808 100644 --- a/lua/keybindings.lua +++ b/lua/keybindings.lua @@ -1,18 +1,11 @@ --- vim.keymap.set('i', 'todo', '// TODO.=strftime("%Y-%m-%d") ') - --- some shortcuts for LSP stuff -vim.keymap.set('n', 'l', ':lua vim.lsp.buf.code_action()') -vim.keymap.set('n', 'F', ':lua vim.lsp.buf.format()') - - -- Setup fzf-lua keybindings local fzf = require('fzf-lua') -vim.keymap.set('n', 'ff', fzf.files, {}) -vim.keymap.set('n', 'fs', fzf.lines, {}) -vim.keymap.set('n', 'fg', fzf.live_grep, {}) -vim.keymap.set('n', 'fk', fzf.keymaps, {}) -vim.keymap.set('n', 'fb', fzf.buffers, {}) -vim.keymap.set('n', 'fc', fzf.commands, {}) -vim.keymap.set('n', 'fC', fzf.command_history, {}) -vim.keymap.set('n', 'fm', fzf.manpages, {}) +vim.keymap.set('n', 'ff', fzf.files, { desc = "Find file" }) +vim.keymap.set('n', 'fs', fzf.blines, { desc = "Search buffer" }) +vim.keymap.set('n', 'fg', fzf.live_grep, { desc = "Grep" }) +vim.keymap.set('n', 'fG', fzf.grep_cword, { desc = "Grep word under cursor" }) +vim.keymap.set('n', 'fb', fzf.buffers, { desc = "Buffers" }) +vim.keymap.set('n', 'fc', fzf.commands, { desc = "Commands" }) +vim.keymap.set('n', 'fC', fzf.command_history, { desc = "Command history" }) +vim.keymap.set('n', 'fm', fzf.manpages, { desc = "Manpages" }) diff --git a/lua/plugins.lua b/lua/plugins.lua index fa05dea..952db6f 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -109,4 +109,20 @@ require("lazy").setup({ }, }, }, + + -- treesitter + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + config = function() + local configs = require("nvim-treesitter.configs") + + configs.setup({ + ensure_installed = { "c", "lua", "vim", "vimdoc", "query", "elixir", "heex", "javascript", "html", "diff", "go", "rust" }, + sync_install = false, + highlight = { enable = true }, + indent = { enable = true }, + }) + end + }, })