vim: fix lsp config

2026-03-16 10:11:08 +01:00 · 2025-12-04 16:50:32 +01:00
parent 2a7e972256
commit 3357121044
13 changed files with 15 additions and 15 deletions
--- a/lib/vim/init.lua
+++ b/lib/vim/init.lua
@@ -155,10 +155,11 @@ local language_servers = {
 }

 for server, settings in pairs(language_servers) do
-  require('lspconfig')[server].setup{
+  vim.lsp.config(server, {
    on_attach = on_attach,
    flags = lsp_flags,
    settings = settings,
    capabilities = capabilities
-  }
+  })
+  vim.lsp.enable(server)
 end
--- a/packages/vimPlugins/cheat-sh.nix
+++ b/packages/vimPlugins/cheat-sh.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "cheat.sh-vim";
  version = "826219d1";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/icalendar-vim.nix
+++ b/packages/vimPlugins/icalendar-vim.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "icalendar.vim";
  version = "542fff45";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/jq-vim.nix
+++ b/packages/vimPlugins/jq-vim.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "jq.vim";
  version = "5baf8ed1";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/mdwa-nvim.nix
+++ b/packages/vimPlugins/mdwa-nvim.nix
@@ -1,8 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-  lib,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "mdwa.nvim";
  version = "9f37270";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/typst-vim.nix
+++ b/packages/vimPlugins/typst-vim.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "typst.vim";
  version = "2882f21";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-256noir.nix
+++ b/packages/vimPlugins/vim-256noir.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "vim-256noir";
  version = "e8668a18";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-colors-paramount.nix
+++ b/packages/vimPlugins/vim-colors-paramount.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix rec {
+vimUtils.buildVimPlugin {
  pname = "vim-colors-paramount";
  version = "a5601d36";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-ernest.nix
+++ b/packages/vimPlugins/vim-ernest.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
  lib,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "vim-ernest";
  version = "4b99bc3";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-fetch.nix
+++ b/packages/vimPlugins/vim-fetch.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix rec {
+}: (vimUtils.buildVimPlugin {
  pname = "vim-fetch";
  version = "76c08586";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-fsharp.nix
+++ b/packages/vimPlugins/vim-fsharp.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "vim-fsharp";
  version = "627db7d7";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-mail.nix
+++ b/packages/vimPlugins/vim-mail.nix
@@ -2,7 +2,7 @@
  vimUtils,
  fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
  pname = "vim-mail";
  version = "acdbb5bd";
  src = fetchFromGitHub {
--- a/packages/vimPlugins/vim-reason-plus.nix
+++ b/packages/vimPlugins/vim-reason-plus.nix
@@ -1,7 +1,7 @@
 {
  vimUtils,
  fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
  pname = "vim-reason-plus";
  version = "c11a2940";
  src = fetchFromGitHub {