wrap tmux-jump and bind it to a key

BrianHicks · Jun 2, 2020 · 38db05c · 38db05c
1 parent d2c7058
commit 38db05c
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 13 deletions.
diff --git a/dotfiles/tmux.nix b/dotfiles/tmux.nix
@@ -1,5 +1,7 @@
-{ pkgs, lib, ... }: {
-  home.packages = [ (pkgs.callPackage ../pkgs/tmux-session { }) ];
+{ pkgs, lib, ... }:
+let tmux-session = pkgs.callPackage ../pkgs/tmux-session { };
+in {
+  home.packages = [ tmux-session ];
 
   programs.tmux = {
     enable = true;
@@ -19,6 +21,7 @@
 
       # quickly open CLI tools
       bind h run-shell "tmux switch-client -t :lazygit || tmux new-window -k -n 'lazygit' -c '#{pane_current_path}' ${pkgs.lazygit}/bin/lazygit"
+      bind j split-window -h ${tmux-session}/bin/tmux-jump
 
       # get rid of the half-second escape time for kakoune's escape key
       set -sg escape-time 25

diff --git a/dotfiles/zsh/jump.zsh b/dotfiles/zsh/jump.zsh
@@ -10,13 +10,4 @@ jump() {
 
 alias j=jump
 
-tmux_jump() {
-    BASE="$HOME/code"
-    SELECTED=$(find "$BASE" -mindepth 2 -maxdepth 2 -type d | sed "s|$BASE/||g" | fzf --tiebreak=end --select-1 --query="$1")
-
-    if [[ "$?" != 0 ]]; then echo "cancelling!"; return 1; fi
-
-    tmux-session "$BASE/$SELECTED"
-}
-
-alias t=tmux_jump
+alias t=tmux-jump
diff --git a/pkgs/tmux-session/default.nix b/pkgs/tmux-session/default.nix
@@ -3,11 +3,19 @@
 with nixpkgs;
 stdenv.mkDerivation {
   name = "tmux-session";
-
   src = ./.;
+  buildInputs = [ pkgs.makeWrapper ];
 
   installPhase = ''
     mkdir -p $out/bin
     cp ./tmux-session $out/bin/tmux-session
+    wrapProgram $out/bin/tmux-session --prefix PATH : ${
+      pkgs.lib.makeBinPath [ tmux ]
+    }
+
+    cp ./tmux-jump $out/bin/tmux-jump
+    wrapProgram $out/bin/tmux-jump --prefix PATH : ${
+      pkgs.lib.makeBinPath [ findutils fzf ]
+    }
   '';
 }
diff --git a/pkgs/tmux-session/tmux-jump b/pkgs/tmux-session/tmux-jump
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+QUERY="${1:-}"
+BASE="$HOME/code"
+SELECTED=$(find "$BASE" -mindepth 2 -maxdepth 2 -type d | sed "s|$BASE/||g" | fzf --tiebreak=end --select-1 --query="$QUERY")
+
+if [[ "$?" != 0 ]]; then echo "cancelling!"; return 1; fi
+
+tmux-session "$BASE/$SELECTED"