diff --git a/config/neovim/lua/opdavies/lsp/init.lua b/config/neovim/lua/opdavies/lsp/init.lua
index 2ffb2f9..f5ad74f 100644
--- a/config/neovim/lua/opdavies/lsp/init.lua
+++ b/config/neovim/lua/opdavies/lsp/init.lua
@@ -141,5 +141,5 @@ vim.keymap.set("n", "<leader>f", function()
   vim.lsp.buf.format { async = true }
 end)
 
-require "opdavies.lsp.null-ls"
+require "opdavies.lsp.none-ls"
 require "opdavies.lsp.signature"
diff --git a/config/neovim/lua/opdavies/lsp/null-ls.lua b/config/neovim/lua/opdavies/lsp/none-ls.lua
similarity index 100%
rename from config/neovim/lua/opdavies/lsp/null-ls.lua
rename to config/neovim/lua/opdavies/lsp/none-ls.lua
diff --git a/system/shared/home-manager.nix b/system/shared/home-manager.nix
index 179a8ed..9603dd1 100644
--- a/system/shared/home-manager.nix
+++ b/system/shared/home-manager.nix
@@ -2,6 +2,17 @@
 
 let
   customVim = with self; {
+    none-ls-nvim = pkgs.vimUtils.buildVimPlugin {
+      name = "none-ls-nvim";
+      src = pkgs.fetchFromGitHub {
+        owner = "nvimtools";
+        repo = "none-ls.nvim";
+        rev = "main";
+        sha256 = "OzwC/i2bzHznf0wunclDEQ+Qfayzje19r4UBDXtbCeI=";
+      };
+      buildPhase = ":";
+    };
+
     toggle-checkbox-nvim = pkgs.vimUtils.buildVimPlugin {
       name = "toggle-checkbox-nvim";
       src = pkgs.fetchFromGitHub {
@@ -615,8 +626,8 @@ in
       vimPlugins.nvim-treesitter-textobjects
 
       # LSP
+      customVim.none-ls-nvim
       vimPlugins.lsp-status-nvim
-      vimPlugins.null-ls-nvim
       vimPlugins.nvim-lspconfig
 
       # Completion