diff --git a/pkgs/default.nix b/pkgs/default.nix index eccb020..1332030 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -9,5 +9,4 @@ rec { emmet-cli = pkgs.callPackage ./emmet-cli.nix { }; material-wifi-icons = pkgs.callPackage ./material-wifi-icons.nix { }; gnome-pass-search-provider = pkgs.callPackage ./gnome-pass-search-provider.nix { }; - kak-tree-sitter = pkgs.callPackage ./kak-tree-sitter.nix { }; } diff --git a/pkgs/kak-tree-sitter.nix b/pkgs/kak-tree-sitter.nix deleted file mode 100644 index 3e3d9d1..0000000 --- a/pkgs/kak-tree-sitter.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - lib, - stdenv, - rustPlatform, - fetchFromSourcehut, - makeWrapper, -}: - -rustPlatform.buildRustPackage rec { - pname = "kak-tree-sitter"; - version = "1.1.2"; - - src = fetchFromSourcehut { - owner = "~hadronized"; - repo = "kak-tree-sitter"; - rev = "kak-tree-sitter-v${version}"; - hash = "sha256-wBWfSyR8LGtug/mCD0bJ4lbdN3trIA/03AnCxZoEOSA="; - }; - - cargoSha256 = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI="; - - nativeBuildInputs = [ makeWrapper ]; - - postFixup = '' - wrapProgram "$out/bin/ktsctl" \ - --suffix PATH : ${stdenv.cc} - ''; - - meta = with lib; { - description = "Server that interfaces tree-sitter with kakoune"; - homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; - license = with licenses; [ mit ]; - }; -} diff --git a/user/kakoune/default.nix b/user/kakoune/default.nix index 051f21d..337e007 100644 --- a/user/kakoune/default.nix +++ b/user/kakoune/default.nix @@ -127,7 +127,7 @@ in ranger bmenu kak-lsp - kak-tree-sitter + unstable.kak-tree-sitter kak-pager kak-man-pager diff --git a/user/kakoune/kak-tree-sitter.nix b/user/kakoune/kak-tree-sitter.nix index 8818f1f..59ab3e0 100644 --- a/user/kakoune/kak-tree-sitter.nix +++ b/user/kakoune/kak-tree-sitter.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let hx-src = pkgs.helix.src; - kts-src = pkgs.kak-tree-sitter.src; + kts-src = pkgs.unstable.kak-tree-sitter-unwrapped.src; inherit (pkgs) fetchFromGitHub; in with pkgs.tree-sitter-grammars;