modules/kakoune: use current system executables

Nix store paths don't really make sense here, because I'd like
nixos-rebuild to affect a running kakoune session.

I removed some obsolete code, and switched from fzf-tmux to choose.

2 files changed, 2 insertions, 18 deletions

diff --git a/modules/shell/kakoune/default.nix b/modules/shell/kakoune/default.nix
index fa5cc9a704ed..c43a28e1cf06 100644
--- a/modules/shell/kakoune/default.nix
+++ b/modules/shell/kakoune/default.nix
@@ -3,6 +3,5 @@
 {
   environment.systemPackages = with pkgs; [ kakoune ];
 
-  xdg.config.users.qyliss.paths."kak/kakrc" =
-    with pkgs; writeText "kakrc" (callPackage ./config.nix {});
+  xdg.config.users.qyliss.paths."kak/kakrc" = pkgs.copyPathToStore ./kakrc;
 }
diff --git a/modules/shell/kakoune/config.nix b/modules/shell/kakoune/kakrc
index 2168b37a6b26..8dcdf39cdded 100644
--- a/modules/shell/kakoune/config.nix
+++ b/modules/shell/kakoune/kakrc
@@ -1,6 +1,3 @@
-{ fzf, tmux }:
-
-''
 # Highlight any files whose names start with "zsh" as sh
 hook global BufCreate (.*/)?\.?zsh.* %{
   set-option buffer filetype sh
@@ -34,10 +31,7 @@ define-command -docstring "export to the system clipboard" clipboard-export %{
 }
 
 define-command -docstring "open a file using fzf" open %{
-  edit %sh{
-    git ls-files -oc --exclude-standard |
-      ${fzf}/bin/fzf-tmux -r 80 --reverse
-  }
+  edit %sh{git ls-files -oc --exclude-standard | choose}
 }
 alias global o open
 
@@ -45,14 +39,6 @@ define-command -params 1.. -docstring "change file modes" chmod %{
   nop %sh{ chmod $@ "$kak_buffile" }
 }
 
-declare-option str last_test
-define-command -docstring "intelligently run code" run %{
-  evaluate-commands -save-regs x %{
-    write
-    nop %sh{${tmux}/bin/tmux split-window -hl 80 "$kak_buffile; read"}
-  }
-}
-
 define-command mkdirp %{
   nop %sh{mkdir -p "$(dirname "$kak_buffile")"}
 }
@@ -93,4 +79,3 @@ set-option global autoreload yes
 
 add-highlighter global/ number-lines -hlcursor -separator "│"
 add-highlighter global/ show-matching
-''