diff --git a/nix/home/desktop.nix b/nix/home/desktop.nix
index 0c8154b..953b0a5 100644
--- a/nix/home/desktop.nix
+++ b/nix/home/desktop.nix
@@ -1,15 +1,6 @@
 { pkgs, lib, ... }:
 
 let
-  obsidian = lib.throwIf (lib.versionOlder "1.5.16" pkgs.obsidian.version) "Obsidian no longer requires EOL Electron" (
-    pkgs.obsidian.override {
-      electron = pkgs.electron_25.overrideAttrs (_: {
-        preFixup = "patchelf --add-needed ${pkgs.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912
-        meta.knownVulnerabilities = [ ]; # NixOS/nixpkgs#273611
-      });
-    }
-  );
-
   defaultPkgs = with pkgs; [
     calibre
     dmenu
diff --git a/nix/home/programs/helix/default.nix b/nix/home/programs/helix/default.nix
index fc6fab8..f5e34bd 100644
--- a/nix/home/programs/helix/default.nix
+++ b/nix/home/programs/helix/default.nix
@@ -4,8 +4,8 @@
     enable = true;
     languages = {
       language-server = {
-        rnix-lsp = {
-          command = "${pkgs.rnix-lsp}/bin/rnix-lsp";
+        nixd = {
+          command = "${pkgs.nixd}/bin/rnix-lsp";
         };
 
         typescript-language-server = {
@@ -20,7 +20,7 @@
           name = "nix";
           auto-format = true;
           language-servers = [
-            { name = "rnix-lsp"; }
+            { name = "nixd"; }
           ];
         }
         {
diff --git a/nix/home/programs/nvim/default.nix b/nix/home/programs/nvim/default.nix
index b20c250..865ca9c 100644
--- a/nix/home/programs/nvim/default.nix
+++ b/nix/home/programs/nvim/default.nix
@@ -148,7 +148,7 @@ with builtins;
               # since both of these are used for actually configuring the system,
               # we'll probably always want them around.
               lua_ls = pkgs.sumneko-lua-language-server;
-              rnix_lsp = pkgs.rnix-lsp;
+              nixd = pkgs.nixd;
             }
           ) }
             EOF
@@ -192,7 +192,7 @@ with builtins;
         plugin = nvim-cmp;
         config = ''
           lua << EOF
-          ${ readFile (./nvim-cmp.lua) }
+          ${ readFile ./nvim-cmp.lua }
           EOF
         '';
       }
diff --git a/nix/home/programs/nvim/nvim-lspconfig.lua b/nix/home/programs/nvim/nvim-lspconfig.lua
index b80ac9f..3271c34 100644
--- a/nix/home/programs/nvim/nvim-lspconfig.lua
+++ b/nix/home/programs/nvim/nvim-lspconfig.lua
@@ -160,8 +160,8 @@ nvim_lsp.tsserver.setup {
 nvim_lsp.elixirls.setup {
   cmd = { "elixir-ls" },
 }
-nvim_lsp.rnix.setup {
-  cmd = { "@rnix_lsp@/bin/rnix-lsp" },
+nvim_lsp.nixd.setup {
+  cmd = { "@nixd@/bin/nixd" },
 }
 nvim_lsp.rust_analyzer.setup {}