From 8bd64fbe7905ca242674b06a718ad139f6112e85 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Mon, 15 Jul 2024 21:24:50 +0200
Subject: [PATCH] Add rust-analyzer and marksman to kak-lsp

---
 home/kakoune/kak.nix                         |  9 ++++++++
 home/modules/programs/my-kakoune/kak-lsp.nix | 24 --------------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/home/kakoune/kak.nix b/home/kakoune/kak.nix
index 83df080..0043c8a 100644
--- a/home/kakoune/kak.nix
+++ b/home/kakoune/kak.nix
@@ -154,6 +154,7 @@ in
             args = [ "--synctex-forward" "%l:1:%f" "%p" "-x" "${./kaktex} jump %%{input} %%{line} %%{column}" ];
           });
     };
+    package = pkgs.texlab;
   };
   programs.kak-lsp.languageServers.typst-lsp = {
     command = "typst-lsp";
@@ -168,6 +169,14 @@ in
     command = "marksman";
     filetypes = [ "markdown" ];
     roots = [ ".marksman.toml" ".git" ];
+    package = pkgs.marksman;
+  };
+  programs.kak-lsp.languageServers.rust-analyzer = {
+    args = [ ];
+    command = "rust-analyzer";
+    filetypes = [ "rust" ];
+    roots = [ "Cargo.toml" ];
+    package = pkgs.rust-analyzer;
   };
 
   programs.my-kakoune.tree-sitter.extraAliases = {
diff --git a/home/modules/programs/my-kakoune/kak-lsp.nix b/home/modules/programs/my-kakoune/kak-lsp.nix
index 8e04c14..eaf3b6b 100644
--- a/home/modules/programs/my-kakoune/kak-lsp.nix
+++ b/home/modules/programs/my-kakoune/kak-lsp.nix
@@ -35,24 +35,6 @@ let
           roots = [ "Setup.hs" "stack.yaml" "*.cabal" "package.yaml" ];
           settings_section = "haskell";
         };
-        texlab = {
-          command = "texlab";
-          filetypes = [ "latex" ];
-          roots = [ ".git" "main.tex" "all.tex" ];
-          settings_section = "texlab";
-          settings.texlab = {
-            build.executable = "latexmk";
-            build.args = [ "-pdf" "-shell-escape" "-interaction=nonstopmode" "-synctex=1" "%f" ];
-
-            build.forwardSearchAfter = true;
-            build.onSave = true;
-
-            forwardSearch = {
-              executable = "/Applications/Skim.app/Contents/SharedSupport/displayline";
-              args = [ "-r" "-g" "%l" "%p" "%f" ];
-            };
-          };
-        };
         nil = {
           command = "${pkgs.nil}/bin/nil";
           filetypes = [ "nix" ];
@@ -67,12 +49,6 @@ let
           offset_encoding = "utf-8";
           roots = [ "requirements.txt" "setup.py" ".git" ".hg" ];
         };
-        rust-analyzer = {
-          args = [ ];
-          command = "rust-analyzer";
-          filetypes = [ "rust" ];
-          roots = [ "Cargo.toml" ];
-        };
       };
       semantic_tokens.faces = [
         ## Items