diff --git a/neovim/dishvim.nix b/neovim/dishvim.nix
--- a/neovim/dishvim.nix
+++ b/neovim/dishvim.nix
@@ -45,9 +45,9 @@
       enable = true;
       formatOnSave = true;
       inlayHints.enable = true;
-      harper-ls.enable = true;
       mappings.renameSymbol = "<Leader>lr";
       mappings.toggleFormatOnSave = "<Leader>uf";
+      presets.harper.enable = true;
     };
     # Languages
     languages = {
diff --git a/neovim/languages/toml.nix b/neovim/languages/toml.nix
--- a/neovim/languages/toml.nix
+++ b/neovim/languages/toml.nix
@@ -1,47 +1,8 @@
-{ lib, pkgs, ... }:
 {
   config.vim = {
-    extraPackages = [
-      pkgs.tombi
-    ];
-    diagnostics.nvim-lint = {
-      linters_by_ft.toml = [ "tombi" ];
-      linters.tombi = {
-        cmd = lib.meta.getExe pkgs.tombi;
-        args = [
-          "lint"
-          "--offline"
-        ];
-      };
-    };
-    formatter.conform-nvim = {
-      setupOpts = {
-        formatters_by_ft.toml = [ "tombi" ];
-        formatters = {
-          tombi = {
-            command = lib.meta.getExe pkgs.tombi;
-            args = [
-              "format"
-              "--offline"
-              "--stdin-filename"
-              "$FILENAME"
-              "-"
-            ];
-          };
-        };
-      };
-    };
-    lsp.servers.tombi = {
+    languages.toml = {
       enable = true;
-      filetypes = [ "toml" ];
-      cmd = [
-        (lib.meta.getExe pkgs.tombi)
-        "lsp"
-        "--offline"
-      ];
+      extraDiagnostics.enable = false;
     };
-    treesitter.grammars = with pkgs.vimPlugins.nvim-treesitter.builtGrammars; [
-      toml
-    ];
   };
 }