aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/kakoune/default.nix16
-rw-r--r--modules/kakoune/kak-active-window.nix11
-rw-r--r--modules/kakoune/kak-tree-sitter.nix8
3 files changed, 27 insertions, 8 deletions
diff --git a/modules/kakoune/default.nix b/modules/kakoune/default.nix
index bacab15..efb26ac 100644
--- a/modules/kakoune/default.nix
+++ b/modules/kakoune/default.nix
@@ -1,22 +1,30 @@
{ pkgs, lib, ... }:
with pkgs;
let
+ my-kakoune = kakoune.override {
+ plugins = with kakounePlugins; [
+ kak-ansi
+ (import ./kak-active-window.nix { inherit pkgs lib; })
+ ];
+ };
kak-tree-sitter-unstable = import ./kak-tree-sitter.nix { inherit pkgs lib; };
kak-tmux = pkgs.writeShellScriptBin "kak-tmux" ''
if [ -t 0 ] && [ -z "$TMUX" ]; then
- exec </dev/tty; exec <&1; ${tmux}/bin/tmux new "${kakoune}/bin/kak$(printf ' %q' "$@")"
+ exec </dev/tty; exec <&1; ${tmux}/bin/tmux new "${my-kakoune}/bin/kak$(printf ' %q' "$@")"
else
- exec "${kakoune}/bin/kak" "$@"
+ exec "${my-kakoune}/bin/kak" "$@"
fi
'';
-in {
+in
+{
environment.systemPackages = [
- kakoune
+ my-kakoune
kakoune-lsp
kakoune-cr
kak-tree-sitter-unstable
kak-tmux
+ editorconfig-core-c
ripgrep
tmux
gitu
diff --git a/modules/kakoune/kak-active-window.nix b/modules/kakoune/kak-active-window.nix
new file mode 100644
index 0000000..a0a5307
--- /dev/null
+++ b/modules/kakoune/kak-active-window.nix
@@ -0,0 +1,11 @@
+{ pkgs, lib }:
+pkgs.kakouneUtils.buildKakounePluginFrom2Nix {
+ pname = "active-window.kak";
+ version = "0.0.0";
+ src = pkgs.fetchFromGitHub {
+ owner = "greenfork";
+ repo = "active-window.kak";
+ rev = "36bf0364eed856a52cddf274072e9f255902c0ee";
+ sha256 = "sha256-6GLt9g20ddbXb29Vdl0YXFDWC73qip9cVU8EgdNlYbs=";
+ };
+}
diff --git a/modules/kakoune/kak-tree-sitter.nix b/modules/kakoune/kak-tree-sitter.nix
index 8860d64..7df49bd 100644
--- a/modules/kakoune/kak-tree-sitter.nix
+++ b/modules/kakoune/kak-tree-sitter.nix
@@ -2,16 +2,16 @@
with pkgs;
rustPlatform.buildRustPackage rec {
pname = "kak-tree-sitter";
- version = "3.0.0-local";
+ version = "3.0.0-local.1";
src = fetchFromSourcehut {
owner = "~hadronized";
repo = "kak-tree-sitter";
- rev = "cdcfb42da9affd9dd0db9e8df1173731c61e3d9f"; # 27 Oct 2025
- hash = "sha256-Q8R++fEJMZFftiI9zGjwF7X8mek2oc40Yl9WMUtQWEA=";
+ rev = "e183201ebdd247b7bbefb9ce9cab10930788aa05"; # 3 Jan 2026
+ hash = "sha256-iDpWzvtM0xQSEqs+TsfW3AGaMYwYkHwWqKrbWPRposc=";
};
- cargoHash = "sha256-lZNM5HqICP6JfaMiBjACcUNRTTTIRhq2ou8cOLU0yOU=";
+ cargoHash = "sha256-WblDG+8GSsy3s2dDE7fgWY6Jkoe7Qqw0ijPR/YQrX7I=";
meta = {
mainProgram = "kak-tree-sitter";