Cleanup the home kakoune module, restore tree-sitter

packages/common/nki-kakoune/default.nix

@@ -1,9 +1,8 @@
 { callPackage, kakoune, kakoune-unwrapped, ... }:
 let
   lsp = callPackage ./lsp.nix { };
-  tree-sitter = callPackage ./tree-sitter { };
   rc = (callPackage ./rc.nix {
-    prependRc = tree-sitter.rc;
+    # prependRc = tree-sitter.rc;
   });
 in
 (kakoune.override {
@@ -13,7 +12,7 @@ in
     (callPackage ./kaktex { })
     (callPackage ./faces.nix { })
     rc
-    tree-sitter.plugin
+    # tree-sitter.plugin
     lsp.plugin
   ];
 }).overrideAttrs (attrs: {
@@ -24,7 +23,6 @@ in
     rm "$out/bin/kak"
     makeWrapper "${kakoune-unwrapped}/bin/kak" "$out/bin/kak" \
       --set KAKOUNE_RUNTIME "$out/share/kak" \
-      --suffix PATH ":" "${lsp.extraPaths}" \
-      --suffix PATH ":" "${tree-sitter.extraPaths}"
+      --suffix PATH ":" "${lsp.extraPaths}"
   '';
 })

packages/common/nki-kakoune/kakrc

@@ -5,6 +5,7 @@
 # set global kts_sky "rgb:6aa622"
 # Color scheme
 colorscheme catppuccin-latte
+set-face global module "%opt{sapphire}"
 set global base "default"
 
 # Set indentation guides

packages/common/nki-kakoune/lsp.nix

@@ -130,7 +130,7 @@ let
         metals = {
           command = "metals";
           filetypes = [ "scala" ];
-          roots = [ "build.sbt" "build.sc" ];
+          roots = [ "build.sbt" "build.sc" "build.mill" ];
           settings_section = "metals";
           settings.metals = {
             enableSemanticHighlighting = true;