From 843d21351d71209a2d3b67001a908e1bea24aa99 Mon Sep 17 00:00:00 2001 From: zackartz Date: Tue, 16 Apr 2024 15:06:40 -0400 Subject: [PATCH] 360 current 2024-04-16 15:06:32 24.05.20240416.c04952a 6.8.4-zen1 * --- modules/home-manager/nvconfig.lua | 106 ------------------ .../vim/config/lua/lsp/config.lua | 14 ++- 2 files changed, 13 insertions(+), 107 deletions(-) delete mode 100644 modules/home-manager/nvconfig.lua diff --git a/modules/home-manager/nvconfig.lua b/modules/home-manager/nvconfig.lua deleted file mode 100644 index 7a4cfbf..0000000 --- a/modules/home-manager/nvconfig.lua +++ /dev/null @@ -1,106 +0,0 @@ -local M = {} - -M.ui = { - ------------------------------- base46 ------------------------------------- - -- hl = highlights - hl_add = {}, - hl_override = {}, - changed_themes = {}, - theme_toggle = { "rosepine", "one_light" }, - theme = "rosepine", -- default theme - transparency = true, - - cmp = { - icons = true, - lspkind_text = true, - style = "default", -- default/flat_light/flat_dark/atom/atom_colored - }, - - telescope = { style = "borderless" }, -- borderless / bordered - - ------------------------------- nvchad_ui modules ----------------------------- - statusline = { - theme = "default", -- default/vscode/vscode_colored/minimal - -- default/round/block/arrow separators work only for default statusline theme - -- round and block will work for minimal theme only - separator_style = "default", - order = nil, - modules = nil, - }, - - -- lazyload it when there are 1+ buffers - tabufline = { - enabled = true, - lazyload = true, - order = { "treeOffset", "buffers", "tabs", "btns" }, - modules = nil, - }, - - nvdash = { - load_on_startup = false, - - header = { - " ▄ ▄ ", - " ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ ", - " █ ▄ █▄█ ▄▄▄ █ █▄█ █ █ ", - " ▄▄ █▄█▄▄▄█ █▄█▄█▄▄█▄▄█ █ ", - " ▄ █▄▄█ ▄ ▄▄ ▄█ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ", - " █▄▄▄▄ ▄▄▄ █ ▄ ▄▄▄ ▄ ▄▄▄ ▄ ▄ █ ▄", - "▄ █ █▄█ █▄█ █ █ █▄█ █ █▄█ ▄▄▄ █ █", - "█▄█ ▄ █▄▄█▄▄█ █ ▄▄█ █ ▄ █ █▄█▄█ █", - " █▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄█ █▄█▄▄▄█ ", - }, - - buttons = { - { " Find File", "Spc f f", "Telescope find_files" }, - { "󰈚 Recent Files", "Spc f o", "Telescope oldfiles" }, - { "󰈭 Find Word", "Spc f w", "Telescope live_grep" }, - { " Bookmarks", "Spc m a", "Telescope marks" }, - { " Themes", "Spc t h", "Telescope themes" }, - { " Mappings", "Spc c h", "NvCheatsheet" }, - }, - }, - - cheatsheet = { theme = "grid" }, -- simple/grid - - lsp = { - signature = true, - semantic_tokens = false, - }, - - term = { - -- hl = "Normal:term,WinSeparator:WinSeparator", - sizes = { sp = 0.3, vsp = 0.2 }, - float = { - relative = "editor", - row = 0.3, - col = 0.25, - width = 0.5, - height = 0.4, - border = "single", - }, - }, -} - -M.base46 = { - integrations = { - "blankline", - "cmp", - "defaults", - "devicons", - "git", - "lsp", - "mason", - "nvcheatsheet", - "nvdash", - "nvimtree", - "statusline", - "syntax", - "treesitter", - "tbline", - "telescope", - "whichkey", - }, -} - -return M diff --git a/modules/home-manager/vim/config/lua/lsp/config.lua b/modules/home-manager/vim/config/lua/lsp/config.lua index 5043d5d..8d0eebf 100644 --- a/modules/home-manager/vim/config/lua/lsp/config.lua +++ b/modules/home-manager/vim/config/lua/lsp/config.lua @@ -25,6 +25,18 @@ M.set_keymaps = function(client, bufnr) end require("lspconfig").tsserver.setup({}) -require("lsp.handlers") +local handlers = require("lsp.handlers") -- Adjust the path as necessary + +local function setup_all_servers() + for server, setup_fn in pairs(handlers) do + if type(setup_fn) == "function" then + -- Call the setup function for each server + setup_fn() + print("Setup LSP server:", server) -- Optional: for debugging + end + end +end + +setup_all_servers() return M