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

Update kak and kak-lsp

Browse source 
Should fix some bugs and bring back upper-case goto
This commit is contained in:
Natsu Kagami 2022-01-30 13:49:25 -05:00
parent 89f97086e7
commit 40f0fd3c88
Signed by: nki
GPG key ID: 7306B3D3C3AD6E51
3 changed files with 30 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
home/kakoune/kak.nix
View file

@ -3,7 +3,7 @@
let
kakounePkg =
let
rev = "9acd4e62dc485aa7e44a601a0300697f8825a98c";
rev = "d44d07bd801a939de65e5c237f65b54c187143c1";
in
pkgs.kakoune.override {
kakoune = pkgs.kakoune-unwrapped.overrideAttrs (oldAttrs: {
@ -12,11 +12,36 @@ let
repo = "kakoune";
owner = "mawww";
rev = rev;
sha256 = "sha256-d0s1wA/GRpq3F6JRBWJaZQPY8UqzTzW5/hx0NlkIC6Q=";
sha256 = "sha256-32WTy5qQgg9Sly86KZcO0gEaHTfHUSNAT+E5+JnHkr8=";
# sha256 = lib.fakeSha256;
};
});
};
kak-lsp =
let
rev = "v12.0.1";
# version = "r${builtins.substring 0 6 rev}";
version = rev;
in
pkgs.kak-lsp.overrideAttrs (drv: rec {
inherit rev version;
buildInputs = drv.buildInputs ++
(with pkgs; lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration);
src = pkgs.fetchFromGitHub {
owner = "kak-lsp";
repo = "kak-lsp";
rev = rev;
sha256 = "sha256-K2GMoLaH7D6UtPuL+GJMqsPFwriyyi7WMdfzBmOceSA=";
# sha256 = lib.fakeSha256;
};
cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
inherit src;
outputHash = "sha256-G7X/dZTryNlwY9n02LL/3yVpB2L1vWGx/lqYblFDAOM=";
# outputHash = lib.fakeSha256;
});
});
in
{
imports = [ ../modules/programs/my-kakoune ./kaktex.nix ];
@ -25,6 +50,7 @@ in
programs.my-kakoune.enable = true;
programs.my-kakoune.enable-fish-session = true;
programs.kak-lsp.enable = true;
programs.kak-lsp.package = kak-lsp;
programs.my-kakoune.package = kakounePkg;
programs.my-kakoune.rc =

2
home/kakoune/kakrc
View file

@ -38,7 +38,7 @@ map global normal <#> ': comment-line<ret>'
map global normal <a-#> ': comment-block<ret>'
# Go to grep-jump
map global goto F -docstring "current grep-jump match" '<esc>: grep-jump<ret>'
map global goto f -docstring "current grep-jump match" '<esc>: grep-jump<ret>'
# System clipboard interactions
hook global RegisterModified '"' %{ nop %sh{

26
home/modules/programs/my-kakoune/kak-lsp.nix
View file

@ -2,28 +2,6 @@
with lib;
let
rev = "744a1981b8cf669a96e329bc255d31e0c2bdcb14";
version = "r${builtins.substring 0 6 rev}";
kak-lsp = pkgs.kak-lsp.overrideAttrs (drv: rec {
inherit rev version;
buildInputs = drv.buildInputs ++
(with pkgs; lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.SystemConfiguration);
src = pkgs.fetchFromGitHub {
owner = "kak-lsp";
repo = "kak-lsp";
rev = rev;
sha256 = "sha256-eeONynT1oJafgJbfl8u/h4OJuORjropDrEUK0Raj8Jg=";
# sha256 = lib.fakeSha256;
};
cargoDeps = drv.cargoDeps.overrideAttrs (lib.const {
inherit src;
outputHash = "sha256-LqsCM4P6aJFZRGOxZtxXvSEbBSeQcC+4WbIwtlrO3e4=";
# outputHash = lib.fakeSha256;
});
});
lspConfig =
{
language = {
@ -231,7 +209,7 @@ in
package = mkOption {
type = types.package;
default = kak-lsp;
default = pkgs.kak-lsp;
};
enableSnippets = mkOption {
@ -283,6 +261,4 @@ in
'';
};
};
}