vim: fix lsp config

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

packages/vimPlugins/cheat-sh.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "cheat.sh-vim";
   version = "826219d1";
   src = fetchFromGitHub {

packages/vimPlugins/icalendar-vim.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "icalendar.vim";
   version = "542fff45";
   src = fetchFromGitHub {

packages/vimPlugins/jq-vim.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "jq.vim";
   version = "5baf8ed1";
   src = fetchFromGitHub {

packages/vimPlugins/mdwa-nvim.nix

@@ -1,8 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-  lib,
+}: (vimUtils.buildVimPlugin {
-}: (vimUtils.buildVimPluginFrom2Nix {
   pname = "mdwa.nvim";
   version = "9f37270";
   src = fetchFromGitHub {

packages/vimPlugins/typst-vim.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "typst.vim";
   version = "2882f21";
   src = fetchFromGitHub {

packages/vimPlugins/vim-256noir.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "vim-256noir";
   version = "e8668a18";
   src = fetchFromGitHub {

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 {

packages/vimPlugins/vim-ernest.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
   lib,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "vim-ernest";
   version = "4b99bc3";
   src = fetchFromGitHub {

packages/vimPlugins/vim-fetch.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix rec {
+}: (vimUtils.buildVimPlugin {
   pname = "vim-fetch";
   version = "76c08586";
   src = fetchFromGitHub {

packages/vimPlugins/vim-fsharp.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "vim-fsharp";
   version = "627db7d7";
   src = fetchFromGitHub {

packages/vimPlugins/vim-mail.nix

@@ -2,7 +2,7 @@
   vimUtils,
   fetchFromGitHub,
 }:
-vimUtils.buildVimPluginFrom2Nix {
+vimUtils.buildVimPlugin {
   pname = "vim-mail";
   version = "acdbb5bd";
   src = fetchFromGitHub {

packages/vimPlugins/vim-reason-plus.nix

@@ -1,7 +1,7 @@
 {
   vimUtils,
   fetchFromGitHub,
-}: (vimUtils.buildVimPluginFrom2Nix {
+}: (vimUtils.buildVimPlugin {
   pname = "vim-reason-plus";
   version = "c11a2940";
   src = fetchFromGitHub {