From 76a7060be7bd1c7c457325f9aa526bf4e63af7f0 Mon Sep 17 00:00:00 2001 From: Alexander Goussas Date: Wed, 7 Jan 2026 21:33:58 -0500 Subject: [PATCH] update lsp config to use latest API --- nvim/.config/nvim/lazy-lock.json | 37 ++++++++--------- nvim/.config/nvim/lua/options.lua | 7 +--- nvim/.config/nvim/lua/plugins/clojure.lua | 9 ---- nvim/.config/nvim/lua/plugins/colorscheme.lua | 8 ---- nvim/.config/nvim/lua/plugins/lsp.lua | 41 ++----------------- nvim/.config/nvim/lua/plugins/telescope.lua | 8 +--- 6 files changed, 24 insertions(+), 86 deletions(-) delete mode 100644 nvim/.config/nvim/lua/plugins/clojure.lua delete mode 100644 nvim/.config/nvim/lua/plugins/colorscheme.lua diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index aa51c2f..598d679 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,31 +1,30 @@ { - "conjure": { "branch": "main", "commit": "0ac12d481141555cc4baa0ad656b590ed30d2090" }, "ghcid": { "branch": "master", "commit": "b7dc5c4ee640b6c8137ecfd0a2b50df278015221" }, - "gitsigns.nvim": { "branch": "main", "commit": "1b0350ab707713b2bc6c236151f1a324175347b1" }, - "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, - "mini.test": { "branch": "main", "commit": "4c70379d07ea44f697d96c7a6f04c79f17b34bb3" }, - "noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" }, + "gitsigns.nvim": { "branch": "main", "commit": "30e5c516f03e0a0a4f71300c52abad481ee90337" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "mini.test": { "branch": "main", "commit": "22f98a71ca0a05e67cddcab9e476e8e0af6a8c19" }, + "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-dap": { "branch": "master", "commit": "14fe46ae16eb272629144a93f7738f5279665a4f" }, - "nvim-dap-ui": { "branch": "master", "commit": "73a26abf4941aa27da59820fd6b028ebcdbcf932" }, + "nvim-autopairs": { "branch": "master", "commit": "c2a0dd0d931d0fb07665e1fedb1ea688da3b80b4" }, + "nvim-dap": { "branch": "master", "commit": "cdfd55a133f63228c55f91378f12908cb2a78ded" }, + "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-grey": { "branch": "main", "commit": "61727a347ea5ce30556698bde32b50b69115a570" }, - "nvim-lspconfig": { "branch": "master", "commit": "6bba673aa8993eceec233be17b42ddfb9540794b" }, + "nvim-grey": { "branch": "main", "commit": "62d268a3e582b846f5c20a895a07bd7d563e9db9" }, + "nvim-lspconfig": { "branch": "master", "commit": "5a82e10b2df0ed31bec642c1c0344baee7c458b6" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-notify": { "branch": "master", "commit": "a22f5d7ac511c2df2fd3290a9f04c48d5a822e2e" }, - "nvim-tree.lua": { "branch": "master", "commit": "b0b49552c9462900a882fe772993b01d780445fe" }, + "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, + "nvim-tree.lua": { "branch": "master", "commit": "b8b44b6a2494d086a9177251a119f9daec6cace8" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-endwise": { "branch": "master", "commit": "d6cbb83307d516ec076d17c9a33d704ef626ee8c" }, - "nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" }, - "one-small-step-for-vimkind": { "branch": "main", "commit": "d9f832598e14f3b206b06f5738d02cebede65269" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "97bf4b8ef9298644a29fcd9dd41a0210cf08cac7" }, + "nvim-treesitter-endwise": { "branch": "master", "commit": "8fe8a95630f4f2c72a87ba1927af649e0bfaa244" }, + "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, + "nvim-web-devicons": { "branch": "master", "commit": "6788013bb9cb784e606ada44206b0e755e4323d7" }, + "one-small-step-for-vimkind": { "branch": "main", "commit": "87eeca2bd4d90a94eed1ef0dbc66885117e7bacb" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "8aafe2cbd89cd4090f573a98cab6b20366576fde" }, "telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "vim-stylish-haskell": { "branch": "master", "commit": "60a59fd767956c40372b5aeab2d68a0a953ebb2b" }, - "vscode-js-debug": { "branch": "main", "commit": "0b5e0dade997b3c702a98e1f58989afcb30612d6" }, + "vscode-js-debug": { "branch": "main", "commit": "9cdabb1278259b4b14cecf077ea9f6b0c1c1fb7f" }, "workspaces.nvim": { "branch": "master", "commit": "55a1eb6f5b72e07ee8333898254e113e927180ca" } } diff --git a/nvim/.config/nvim/lua/options.lua b/nvim/.config/nvim/lua/options.lua index 9aef071..daf8058 100644 --- a/nvim/.config/nvim/lua/options.lua +++ b/nvim/.config/nvim/lua/options.lua @@ -21,10 +21,5 @@ vim.o.termguicolors = true vim.g.loaded_netrw = 1 vim.g.loaded_netrwPlugin = 1 -vim.cmd('colorscheme zaibatsu') +vim.cmd('colorscheme vim') --- Conjure options -vim.g['conjure#log#diagnostics'] = true -vim.g['conjure#highlight#enabled'] = true -vim.g['conjure#log#split#width'] = 0.4 -vim.g['conjure#log#wrap'] = 0.4 diff --git a/nvim/.config/nvim/lua/plugins/clojure.lua b/nvim/.config/nvim/lua/plugins/clojure.lua deleted file mode 100644 index d59eec6..0000000 --- a/nvim/.config/nvim/lua/plugins/clojure.lua +++ /dev/null @@ -1,9 +0,0 @@ -return { - { "Olical/conjure" }, - { 'HiPhish/rainbow-delimiters.nvim' }, - { - 'windwp/nvim-autopairs', - event = "InsertEnter", - config = true - } -} diff --git a/nvim/.config/nvim/lua/plugins/colorscheme.lua b/nvim/.config/nvim/lua/plugins/colorscheme.lua deleted file mode 100644 index 10c5b9e..0000000 --- a/nvim/.config/nvim/lua/plugins/colorscheme.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - 'yorickpeterse/nvim-grey', - config = function() - -- vim.cmd('colo grey') - end - } -} diff --git a/nvim/.config/nvim/lua/plugins/lsp.lua b/nvim/.config/nvim/lua/plugins/lsp.lua index f7ce104..311d02b 100644 --- a/nvim/.config/nvim/lua/plugins/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/lsp.lua @@ -2,44 +2,11 @@ return { { "neovim/nvim-lspconfig", config = function() - local lspconfig = require('lspconfig') - -- Language servers - - lspconfig.gopls.setup({}) - lspconfig.templ.setup({}) - - lspconfig.pylsp.setup({}) - lspconfig.svelte.setup({}) - - -- npm install -g typescript typescript-language-server - lspconfig.ts_ls.setup({}) - - -- npm install -g @elm-tooling/elm-language-server - -- npm install -g elm elm-test elm-format - -- npm install -g elm-review - lspconfig.elmls.setup({}) - - lspconfig.lua_ls.setup({ - settings = { - Lua = { - runtime = { - version = 'LuaJIT', - }, - diagnostics = { - globals = { 'vim' }, - }, - workspace = { - library = vim.api.nvim_get_runtime_file("", true), - }, - telemetry = { - enable = false, - }, - }, - }, - }) - - lspconfig.clojure_lsp.setup({}) + for _, l in ipairs({'gopls', 'templ', 'ts_ls', 'rust_analyzer'}) do + vim.lsp.enable(l) + vim.lsp.config(l, {}) + end vim.api.nvim_create_autocmd('LspAttach', { callback = function(args) diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua index 3889209..5e9a567 100644 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -5,7 +5,6 @@ return { branch = '0.1.x', dependencies = { 'nvim-lua/plenary.nvim', - -- { dir = '~/Code/telescope-find-exe.nvim/' } }, config = function() local telescope = require('telescope') @@ -18,8 +17,7 @@ return { telescope.setup({ defaults = { sorting_strategy = "ascending", - -- layout_strategy = "bottom_pane", - layout_strategy = "grey", + layout_strategy = "bottom_pane", layout_config = { prompt_position = "top" }, @@ -27,10 +25,6 @@ return { preview = false, } }) - - telescope.load_extension('grey') - telescope.load_extension("workspaces") - -- telescope.load_extension('find_exe') end }, } -- 2.43.0