From 802dbb7c08264767c7345b163ed01fe39ace2782 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Sun, 4 Aug 2024 02:44:12 -0700 Subject: [PATCH] Revert "tmux-sessionizer: writeShellApplication" This reverts commit 7d1a5fa9d525f3a86f0c2e7ff8df35ad36f0edb8. --- home/modules/tmux-sessionizer.nix | 53 ++++++++++++++++--------------- 1 file changed, 28 insertions(+), 25 deletions(-) diff --git a/home/modules/tmux-sessionizer.nix b/home/modules/tmux-sessionizer.nix index 01ca529..51a210c 100644 --- a/home/modules/tmux-sessionizer.nix +++ b/home/modules/tmux-sessionizer.nix @@ -23,36 +23,39 @@ in config = lib.mkIf enable { snowhawk.tmux.sessionizer.pkg = - lib.mkDefault - (pkgs.writeShellApplication { - name = "tmux-sessionizer"; - runtimeInputs = with pkgs; [ tmux procps coreutils fzf findutils ]; - text = '' - if [[ $# -eq 1 ]]; then - selected=$1 - else - selected=$(find "$(readlink -f ~/projects)" ~/ ~/.config ~/.suckless/ -mindepth 1 -maxdepth 1 -type d | fzf) - fi + let + tmux = "${pkgs.tmux}/bin/tmux"; + pgrep = "${pkgs.procps}/bin/pgrep"; + basename = "${pkgs.coreutils}/bin/basename"; + tr = "${pkgs.coreutils}/bin/tr"; + fzf = "${pkgs.fzf}/bin/fzf"; + find = "${pkgs.findutils}/bin/find"; + in + lib.mkDefault (pkgs.writeShellScriptBin "tmux-sessionizer" '' + if [[ $# -eq 1 ]]; then + selected=$1 + else + selected=$(${find} "$(readlink -f ~/projects)" ~/ ~/.config ~/.suckless/ -mindepth 1 -maxdepth 1 -type d | ${fzf}) + fi - if [[ -z $selected ]]; then - exit 0 - fi + if [[ -z $selected ]]; then + exit 0 + fi - selected_name=$(basename "$selected" | tr . _) - tmux_running=$(pgrep tmux) + selected_name=$(${basename} "$selected" | ${tr} . _) + tmux_running=$(${pgrep} tmux) - if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then - tmux new-session -s "$selected_name" -c "$selected" - exit 0 - fi + if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then + ${tmux} new-session -s "$selected_name" -c "$selected" + exit 0 + fi - if ! tmux has-session -t="$selected_name" 2>/dev/null; then - tmux new-session -ds "$selected_name" -c "$selected" - fi + if ! ${tmux} has-session -t="$selected_name" 2>/dev/null; then + ${tmux} new-session -ds "$selected_name" -c "$selected" + fi - tmux switch-client -t "$selected_name" - ''; - }); + ${tmux} switch-client -t "$selected_name" + ''); home.packages = [ config.snowhawk.tmux.sessionizer.pkg