From f21a2300a3ca92022aeef901ca67dff4c3a3d62d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 11 Jan 2026 00:13:19 -0500
Subject: [PATCH] [dishvim] css/json factored out, add toml

---
 neovim/dishvim.nix        | 11 ++++++-----
 neovim/languages/css.nix  | 12 ++++++++++++
 neovim/languages/json.nix | 12 ++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 neovim/languages/css.nix
 create mode 100644 neovim/languages/json.nix

diff --git a/neovim/dishvim.nix b/neovim/dishvim.nix
index bbcfe0e0..8fd1b420 100644
--- a/neovim/dishvim.nix
+++ b/neovim/dishvim.nix
@@ -2,11 +2,14 @@
 {
   imports = [
     # keep-sorted start
-    ./misc/cursor-restore.nix
-    ./lualine.nix
+    ./languages/css.nix
+    ./languages/json.nix
     ./languages/markdown.nix
-    ./languages/sql.nix
     ./languages/rust.nix
+    ./languages/sql.nix
+    ./languages/toml.nix
+    ./lualine.nix
+    ./misc/cursor-restore.nix
     # keep-sorted end
   ];
   config.vim = {
@@ -59,10 +62,8 @@
       enableFormat = true;
       enableTreesitter = true;
       enableExtraDiagnostics = true;
-      css.enable = true;
       cue.enable = true;
       html.enable = true;
-      json.enable = true;
       just.enable = true;
       lua.enable = true;
       nix = {
diff --git a/neovim/languages/css.nix b/neovim/languages/css.nix
new file mode 100644
index 00000000..8206c8ef
--- /dev/null
+++ b/neovim/languages/css.nix
@@ -0,0 +1,12 @@
+{ lib, pkgs, ... }:
+{
+  config.vim = {
+    lsp.servers.cssls.cmd = lib.mkForce [
+      (lib.meta.getExe pkgs.vscode-css-languageserver)
+      "--stdio"
+    ];
+    languages = {
+      css.enable = true;
+    };
+  };
+}
diff --git a/neovim/languages/json.nix b/neovim/languages/json.nix
new file mode 100644
index 00000000..8c42c5f1
--- /dev/null
+++ b/neovim/languages/json.nix
@@ -0,0 +1,12 @@
+{ lib, pkgs, ... }:
+{
+  config.vim = {
+    lsp.servers.jsonls.cmd = lib.mkForce [
+      (lib.meta.getExe pkgs.vscode-json-languageserver)
+      "--stdio"
+    ];
+    languages = {
+      json.enable = true;
+    };
+  };
+}
-- 
2.54.0