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

Compare commits

base: nki:32e723996b4d3bb0f2a3c57b697a0dba5559dd22
Branches Tags
nki:master
nki:kakoune-package
nki:niri
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test
..
compare: nki:30c48b9340b1df5237601085356fb51a4d05bfae
Branches Tags
nki:kakoune-package
nki:master
nki:niri
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test

No commits in common. "32e723996b4d3bb0f2a3c57b697a0dba5559dd22" and "30c48b9340b1df5237601085356fb51a4d05bfae" have entirely different histories.
32e723996b ... 30c48b9340

3 changed files with 8 additions and 20 deletions
Show stats Expand all files Collapse all files

8
flake.lock
View file

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

2
flake.nix
View file

@ -55,7 +55,7 @@
# --- Sources # --- Sources
kakoune.url = "github:mawww/kakoune"; kakoune.url = "github:mawww/kakoune";
kakoune.flake = false; 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; kak-lsp.flake = false;
nixos-m1.url = "github:tpwrules/nixos-apple-silicon"; nixos-m1.url = "github:tpwrules/nixos-apple-silicon";
nixos-m1.inputs.nixpkgs.follows = "nixpkgs"; nixos-m1.inputs.nixpkgs.follows = "nixpkgs";

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

@ -16,7 +16,6 @@
, texlab , texlab
, tinymist , tinymist
, marksman , marksman
, templ
, rust-analyzer , rust-analyzer
, ... , ...
}: }:
@ -34,12 +33,12 @@ let
languageServers = languageServers =
let let
vscodeServerWith = { name, extraFileTypes ? [ ] }: { vscodeServerOf = name: {
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 ] ++ extraFileTypes; filetypes = [ name "templ" ];
roots = [ "package.json" ".git" ]; roots = [ "package.json" ".git" ];
package = nodePackages.vscode-langservers-extracted; package = nodePackages.vscode-langservers-extracted;
}; };
@ -188,13 +187,6 @@ 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";
@ -203,11 +195,7 @@ let
package = rust-analyzer; package = rust-analyzer;
}; };
} // (builtins.listToAttrs (builtins.map } // (builtins.listToAttrs (builtins.map vscodeServerOf [ "html" "css" "json" ]));
(ft: vscodeServerWith {
name = ft;
extraFileTypes = if ft == "json" then [ ] else [ "templ" ];
}) [ "html" "css" "json" ]));
faces = [ faces = [
## Items ## Items