diff --git a/nix/modules/darwin/tools/lsp/default.nix b/nix/modules/darwin/tools/lsp/default.nix
index 6920eef4..b26c804a 100644
--- a/nix/modules/darwin/tools/lsp/default.nix
+++ b/nix/modules/darwin/tools/lsp/default.nix
@@ -17,7 +17,7 @@ in {
     environment.systemPackages = with pkgs; [
       lua-language-server # LSP for lua
       marksman # LSP for markdown
-      rnix-lsp # LSP for nix
+      nil # LSP for nix
       tree-sitter
       yamllint
       nodejs_21 # Note for LSP servers
diff --git a/nix/modules/nixos/system/nix/default.nix b/nix/modules/nixos/system/nix/default.nix
index 9619c45b..25781e7a 100644
--- a/nix/modules/nixos/system/nix/default.nix
+++ b/nix/modules/nixos/system/nix/default.nix
@@ -22,7 +22,7 @@ in {
   config = mkIf cfg.enable {
     environment.systemPackages = with pkgs; [
       cachix
-      rnix-lsp
+      nil
       nixfmt
       nix-index
       nix-prefetch-git
diff --git a/nix/modules/nixos/tools/lsp/default.nix b/nix/modules/nixos/tools/lsp/default.nix
index 6920eef4..b26c804a 100644
--- a/nix/modules/nixos/tools/lsp/default.nix
+++ b/nix/modules/nixos/tools/lsp/default.nix
@@ -17,7 +17,7 @@ in {
     environment.systemPackages = with pkgs; [
       lua-language-server # LSP for lua
       marksman # LSP for markdown
-      rnix-lsp # LSP for nix
+      nil # LSP for nix
       tree-sitter
       yamllint
       nodejs_21 # Note for LSP servers
diff --git a/nvim/lua/plugins/lsp.lua b/nvim/lua/plugins/lsp.lua
index 803b0400..d9e34781 100644
--- a/nvim/lua/plugins/lsp.lua
+++ b/nvim/lua/plugins/lsp.lua
@@ -115,7 +115,7 @@ return {
                     require("lspconfig")[server].setup(server_opts)
                 end,
                 -- manually configured servers
-                require("lspconfig")["rnix"].setup {},
+                require("lspconfig")["nil_ls"].setup {},
                 require("lspconfig")["marksman"].setup { cmd = { "marksman", "server" } },
 
                 require("lspconfig")["lua_ls"].setup {