flake.lock

@@ -737,16 +737,16 @@
     "kak-lsp": {
       "flake": false,
       "locked": {
-        "lastModified": 1737458684,
-        "narHash": "sha256-wIKAChmD6gVfrRguywiAnpT3kbCbRk2k2u4ckd1CNOw=",
+        "lastModified": 1734533380,
+        "narHash": "sha256-7ULohcCpIKOb7CtsF2dIkiRt94uBIrGD5pQ2AEfrNrY=",
         "owner": "kakoune-lsp",
         "repo": "kakoune-lsp",
-        "rev": "d5db3de3b88a8a158e1bfa43f13d8766a6c6d522",
+        "rev": "dc348f04038f7286d606e99719509d6dbd2469da",
         "type": "github"
       },
       "original": {
         "owner": "kakoune-lsp",
-        "ref": "v18.1.2",
+        "ref": "v18.1.1",
         "repo": "kakoune-lsp",
         "type": "github"
       }

flake.nix

@@ -55,7 +55,7 @@
     # --- Sources
     kakoune.url = "github:mawww/kakoune";
     kakoune.flake = false;
-    kak-lsp.url = "github:kakoune-lsp/kakoune-lsp/v18.1.2";
+    kak-lsp.url = "github:kakoune-lsp/kakoune-lsp/v18.1.1";
     kak-lsp.flake = false;
     nixos-m1.url = "github:tpwrules/nixos-apple-silicon";
     nixos-m1.inputs.nixpkgs.follows = "nixpkgs";

packages/common/nki-kakoune/lsp.nix

@@ -16,7 +16,6 @@
 , texlab
 , tinymist
 , marksman
-, templ
 , rust-analyzer
 , ...
 }:
@@ -34,12 +33,12 @@ let
 
     languageServers =
       let
-        vscodeServerWith = { name, extraFileTypes ? [ ] }: {
+        vscodeServerOf = name: {
           name = "vscode-${name}-language-server";
           value = {
             args = [ "--stdio" ];
             command = "vscode-${name}-language-server";
-            filetypes = [ name ] ++ extraFileTypes;
+            filetypes = [ name "templ" ];
             roots = [ "package.json" ".git" ];
             package = nodePackages.vscode-langservers-extracted;
           };
@@ -188,13 +187,6 @@ let
           roots = [ ".marksman.toml" ".git" ];
           package = marksman;
         };
-        templ = {
-          command = "templ";
-          args = [ "lsp" ];
-          filetypes = [ "templ" ];
-          roots = [ "go.mod" ".git" ];
-          package = templ;
-        };
         rust-analyzer = {
           args = [ ];
           command = "rust-analyzer";
@@ -203,11 +195,7 @@ let
           package = rust-analyzer;
         };
 
-      } // (builtins.listToAttrs (builtins.map
-        (ft: vscodeServerWith {
-          name = ft;
-          extraFileTypes = if ft == "json" then [ ] else [ "templ" ];
-        }) [ "html" "css" "json" ]));
+      } // (builtins.listToAttrs (builtins.map vscodeServerOf [ "html" "css" "json" ]));
 
     faces = [
       ## Items