From f483bd632cfd4df9df0e31fa1bd71df6bb918bcb Mon Sep 17 00:00:00 2001 From: MFlossmann Date: Fri, 12 Jul 2024 15:18:42 +0200 Subject: [PATCH] edit the lsp config --- plugins/lsp.nix | 35 +++++++++++++++++++++++++++-------- plugins/telescope.nix | 38 +++++++++++++++++++------------------- 2 files changed, 46 insertions(+), 27 deletions(-) diff --git a/plugins/lsp.nix b/plugins/lsp.nix index ebea72f..1c8b15f 100644 --- a/plugins/lsp.nix +++ b/plugins/lsp.nix @@ -32,7 +32,26 @@ action = "code_action"; desc = "LSP code action"; }; - + "lr" = { + action = "rename"; + desc = "Rename current symbol"; + }; + "lR" = { + action = "rename"; + desc = "Search references"; + }; + "lh" = { + action = "signature_help"; + desc = "Signature help"; + }; + "lG" = { + action = "workspace_symbol"; + desc = "Search workspace symbols"; + }; + "gK" = { + action = "signature_help"; + desc = "Signature help"; + }; gd = { action = "definition"; desc = "Go to definition"; @@ -80,25 +99,25 @@ # Load all servers definitions servers = { - ansiblels.enable = true; bashls.enable = true; cssls.enable = true; docker-compose-language-service.enable = true; dockerls.enable = true; - eslint.enable = true; - gopls.enable = true; helm-ls.enable = true; html.enable = true; - java-language-server.enable = true; jsonls.enable = true; lua-ls.enable = true; nginx-language-server.enable = true; nixd.enable = true; pyright.enable = true; - sqls.enable = true; - terraformls.enable = true; - tsserver.enable = true; yamlls.enable = true; + clangd.enable = true; + marksman.enable = true; + texlab.enable = true; + + java-language-server.enable = false; + zls.enable = false; + rust-analyzer.enable = false; typos-lsp = { enable = true; diff --git a/plugins/telescope.nix b/plugins/telescope.nix index faa4d37..5cfeb09 100644 --- a/plugins/telescope.nix +++ b/plugins/telescope.nix @@ -35,25 +35,25 @@ # │ │ Preview │ │ # │ └────────────────────────────────────────┘ │ # └──────────────────────────────────────────────────┘ - extraConfigLuaPre = '' - local TelescopeWithTheme = function(fn, args, extension) - args.layout_config = { - anchor = "N", - mirror = true, - width = 0.8, - } - - if fn == "keymaps" or fn == "registers" then args.layout_config.height = function(_, _, max_lines) return max_lines end end - - local args_with_theme = require("telescope.themes").get_dropdown(args) - - if extension ~= "" then - require("telescope").extensions[extension][fn](args_with_theme) - else - require("telescope.builtin")[fn](args_with_theme) - end - end - ''; + # extraConfigLuaPre = '' + # local TelescopeWithTheme = function(fn, args, extension) + # args.layout_config = { + # anchor = "N", + # mirror = true, + # width = 0.8, + # } + # + # if fn == "keymaps" or fn == "registers" then args.layout_config.height = function(_, _, max_lines) return max_lines end end + # + # local args_with_theme = require("telescope.themes").get_dropdown(args) + # + # if extension ~= "" then + # require("telescope").extensions[extension][fn](args_with_theme) + # else + # require("telescope.builtin")[fn](args_with_theme) + # end + # end + # ''; # Use root keymaps to allow usage of custom TelescopeWithTheme function keymaps =