Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: tmux-plugins/tpm
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pale3/tpm
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Dec 19, 2023

  1. use env TMUX_CONF_FILE to override default tmux.conf locations, #205 

    TMUX_CONF_FILE takes precendace over $HOME/.tmux.conf or
XDG_CONFIG_HOME/tmux/tmux.conf which allows internal tpm
scripts to properly parse user_config

E.g in your tmux.conf.local which is sourced by tmux.conf
add set-environment -g "TMUX_CONF_FILE" "/path/to/tmux.conf.local"
    @pale3
    pale3 committed Dec 19, 2023

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    e693f7b View commit details
Showing with 7 additions and 1 deletion.
  1. +7 −1 scripts/helpers/plugin_functions.sh
8 changes: 7 additions & 1 deletion scripts/helpers/plugin_functions.sh
View file
Original file line number Diff line number Diff line change
@@ -33,7 +33,13 @@ _get_user_tmux_conf() {
}

_tmux_conf_contents() {
user_config=$(_get_user_tmux_conf)

if [ -n "$TMUX_CONF_FILE" ]; then
user_config="$TMUX_CONF_FILE"
else
user_config=$(_get_user_tmux_conf)
fi

cat /etc/tmux.conf "$user_config" 2>/dev/null
if [ "$1" == "full" ]; then # also output content from sourced files
local file