diff --git a/flake.nix b/flake.nix
index 9aae593..7458b25 100644
--- a/flake.nix
+++ b/flake.nix
@@ -71,6 +71,7 @@
           {
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;
+            home-manager.backupFileExtension = "bak";
             home-manager.users.barrett = import ./home/home.nix;
             home-manager.extraSpecialArgs = {
               inherit zen-browser;
diff --git a/home/modules/editor.nix b/home/modules/editor.nix
index 808c18a..ae12074 100644
--- a/home/modules/editor.nix
+++ b/home/modules/editor.nix
@@ -6,30 +6,44 @@
     MANPAGER = "nvim +Man!";
   };
 
-  home.packages = with pkgs; [
-    nodejs
-    isort
-    black
-    mypy
-    stylua
-    selene
-    prettierd
-    eslint_d
-    shfmt
-    buf
-    hadolint
-    cbfmt
-    cmake-format
-    checkmake
-    cpplint
-    texlivePackages.latexindent
-  ];
-
   programs.neovim = {
     enable = true;
     defaultEditor = true;
     viAlias = true;
     vimAlias = true;
+    extraPackages = with pkgs; [
+      # lsp
+      bash-language-server
+      basedpyright
+      clang-tools
+      emmet-language-server
+      lua-language-server
+      ruff
+      tinymist
+      vscode-langservers-extracted
+
+      # formatters
+      black
+      buf
+      cbfmt
+      cmake-format
+      isort
+      prettierd
+      shfmt
+      stylua
+
+      # linters
+      checkmake
+      cpplint
+      eslint_d
+      hadolint
+      mypy
+      selene
+
+      # runtime/tools
+      nodejs
+      websocat
+    ];
   };
 
   xdg.configFile."nvim".source =