diff --git a/lib/vim/init.lua b/lib/vim/init.lua
index 92b77d1..be2dd6e 100644
--- 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
diff --git a/packages/vimPlugins/cheat-sh.nix b/packages/vimPlugins/cheat-sh.nix
index 6d5e71f..5cebd7c 100644
--- 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 {
diff --git a/packages/vimPlugins/icalendar-vim.nix b/packages/vimPlugins/icalendar-vim.nix
index 9a6972e..053c587 100644
--- 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 {
diff --git a/packages/vimPlugins/jq-vim.nix b/packages/vimPlugins/jq-vim.nix
index 46ea7bb..674a6ba 100644
--- 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 {
diff --git a/packages/vimPlugins/mdwa-nvim.nix b/packages/vimPlugins/mdwa-nvim.nix
index 4ec52a9..8672e92 100644
--- 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 {
diff --git a/packages/vimPlugins/typst-vim.nix b/packages/vimPlugins/typst-vim.nix
index 5464eaf..7abb85d 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-256noir.nix b/packages/vimPlugins/vim-256noir.nix
index 0830337..5d8dafe 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-colors-paramount.nix b/packages/vimPlugins/vim-colors-paramount.nix
index 349ec52..cdb98ac 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-ernest.nix b/packages/vimPlugins/vim-ernest.nix
index 1b33d96..d369880 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-fetch.nix b/packages/vimPlugins/vim-fetch.nix
index 6668915..99f0ee7 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-fsharp.nix b/packages/vimPlugins/vim-fsharp.nix
index 190db27..2246cda 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-mail.nix b/packages/vimPlugins/vim-mail.nix
index d7ec65a..4bc451d 100644
--- 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 {
diff --git a/packages/vimPlugins/vim-reason-plus.nix b/packages/vimPlugins/vim-reason-plus.nix
index 5d9d5e4..aad38ad 100644
--- 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 {