diff --git a/shared/home/default.nix b/shared/home/default.nix index bc39311..c556cd3 100644 --- a/shared/home/default.nix +++ b/shared/home/default.nix @@ -206,11 +206,13 @@ in { set-option -g default-terminal "screen-256color" set-option -sa terminal-features ',xterm-256color:RGB' - run-shell ${(pkgs.substituteAll { - src = ./urlview.tmux; - extract_url = pkgs.extract_url; - }) - .outPath} + run-shell ${pkgs.writeShellScript "urlview" + (builtins.readFile + (pkgs.substituteAll { + src = ./urlview.tmux; + extract_url = pkgs.extract_url; + }) + .outPath)} ''; }; } diff --git a/shared/home/urlview-mine.tmux b/shared/home/urlview-mine.tmux deleted file mode 100644 index e9a6d26..0000000 --- a/shared/home/urlview-mine.tmux +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env bash - -get_tmux_option() { - local option=$1 - local default_value=$2 - local option_value - option_value=$(tmux show-option -gqv "$option") - if [ -z "$option_value" ]; then - echo "$default_value" - else - echo "$option_value" - fi -} - -readonly key="$(get_tmux_option "@urlview-key" "u")" - -tmux bind-key "$key" capture-pane -J \\\; \ - save-buffer "${TMPDIR:-/tmp}/tmux-buffer" \\\; \ - delete-buffer \\\; \ - split-window -l 10 "@extract_url@/bin/extract_url" '${TMPDIR:-/tmp}/tmux-buffer'" diff --git a/shared/home/urlview.tmux b/shared/home/urlview.tmux old mode 100644 new mode 100755 index 88752ce..0fa00c1 --- a/shared/home/urlview.tmux +++ b/shared/home/urlview.tmux @@ -1,32 +1,17 @@ -#!/usr/bin/env bash - +# shellcheck shell=bash get_tmux_option() { local option=$1 local default_value=$2 - local option_value=$(tmux show-option -gqv "$option") - if [ -z $option_value ]; then - echo $default_value + local option_value + option_value=$(tmux show-option -gqv "$option") + if [ -z "$option_value" ]; then + echo "$default_value" else - echo $option_value + echo "$option_value" fi } -find_executable() { - if type urlview >/dev/null 2>&1; then - echo "urlview" - elif type extract_url >/dev/null 2>&1; then - echo "extract_url" - fi -} - -readonly key="$(get_tmux_option "@urlview-key" "u")" -readonly cmd="$(find_executable)" - -if [ -z "$cmd" ]; then - tmux display-message "Failed to load tmux-urlview: neither urlview nor extract_url were found on the PATH" -else - tmux bind-key "$key" capture-pane -J \\\; \ - save-buffer "${TMPDIR:-/tmp}/tmux-buffer" \\\; \ - delete-buffer \\\; \ - split-window -l 10 "$cmd '${TMPDIR:-/tmp}/tmux-buffer'" -fi +tmux bind-key "$(get_tmux_option "@urlview-key" "u")" capture-pane -J \\\; \ + save-buffer "${TMPDIR:-/tmp}/tmux-buffer" \\\; \ + delete-buffer \\\; \ + split-window -l 10 "@extract_url@/bin/extract_url '${TMPDIR:-/tmp}/tmux-buffer'"