nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Move kakoune to a full-fledged package #4

Open
nki wants to merge 42 commits from kakoune-package into master
pull from: kakoune-package
merge into: nki:master
Conversation 0 Commits 42 Files changed 35 +15 -3
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 8aa7c77fd0 - Show all commits

18
packages/common/nki-kakoune/lsp.nix
View file

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