Update for kakoune plugin PR

dogfood/default.nix

@@ -29,7 +29,7 @@
           };
         };
 
-        kakoune-unwrapped = super.kakoune-unwrapped.overrideAttrs (oldAttrs: {
+        kakoune = super.kakoune.overrideAttrs (oldAttrs: {
           src = super.pkgs.fetchFromGitHub (import ./kakoune.nix);
           enableParallelBuilding = true;
         });

dogfood/kak-plumb.nix

@@ -1,6 +1,7 @@
 {
   owner = "eraserhd";
   repo = "kak-plumb";
-  rev = "7123a9c19bd61d9310cefb59c6434786b5f437bb";
-  sha256 = "115wwlisjl42qmgqksccdw5vlqfmgf9yfhfw5fbgzfs9kc5qabdb";
-}
+  rev = "3a517c9ef23eb774dc9e47cbdc3bd6b7d8fe2153";
+  sha256 = "1ww11ppd0brpwx7qmpzxl5fp1vj0azqgz44sbxn1310pm062mrh7";
+  fetchSubmodules = false;
+}

kakoune/default.nix

@@ -10,18 +10,16 @@ in {
     {
       nixpkgs.overlays = [
         (self: super: {
-          kakoune = super.wrapKakoune self.kakoune-unwrapped {
-            configure = {
-              plugins = with self.kakounePlugins; [
-                #case-kak
-                kak-ansi
-                kak-fzf
-                my-kak-plumb
-                parinfer-rust
-              ]
-              # Remove this hack when Graal is on MacOS
-              ++ lib.optional (!pkgs.stdenv.isDarwin) rep;
-            };
+          kakoune-with-plugins = super.kakoune-with-plugins.override {
+            plugins = with pkgs.kakounePlugins; [
+              #case-kak
+              kak-ansi
+              kak-fzf
+              my-kak-plumb
+              parinfer-rust
+            ]
+            # Remove this hack when Graal is on MacOS
+            ++ lib.optional (!pkgs.stdenv.isDarwin) rep;
           };
           kakouneWrapper = super.callPackage ./wrapper {};
         })

kakoune/wrapper/default.nix

@@ -1,8 +1,8 @@
-{ bash, kakoune, stdenv }:
+{ bash, kakoune-with-plugins, stdenv }:
 
 stdenv.mkDerivation {
   name = "kakouneWrapper";
-  buildInputs = [ bash kakoune ];
+  buildInputs = [ bash kakoune-with-plugins ];
   src = ./wrapper.sh;
 
   phases = [ "installPhase" "fixupPhase" ];
@@ -12,6 +12,6 @@ stdenv.mkDerivation {
     cp $src $out/bin/kak
     substituteInPlace $out/bin/kak \
         --subst-var-by bash "${bash}" \
-        --subst-var-by kakoune "${kakoune}"
+        --subst-var-by kakoune-with-plugins "${kakoune-with-plugins}"
   '';
 }

kakoune/wrapper/wrapper.sh

@@ -4,7 +4,7 @@
 #       for the current tmux window.
 #
 
-kak="@kakoune@/bin/kak"
+kak="@kakoune-with-plugins@/bin/kak"
 declare -a extraArgs=()
 
 canSpecifySession() {