diff --git a/dot_config/tmux/plugins/tmux-navigate/README.md b/dot_config/tmux/plugins/tmux-navigate/README.md new file mode 100644 index 0000000..cd02ca0 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/README.md @@ -0,0 +1,81 @@ +# tmux-navigate + +Intelligently navigate tmux panes and Vim splits using the same keys. +This also supports SSH tunnels where Vim is running on a remote host. + + | inside Vim? | is Zoomed? | Action taken by key binding | + | ----------- | ---------- | --------------------------- | + | No | No | Focus directional tmux pane | + | No | Yes | Nothing: ignore key binding | + | Yes | No | Seamlessly focus Vim / tmux | + | Yes | Yes | Focus directional Vim split | + +See https://sunaku.github.io/tmux-select-pane.html for documentation. + +## Installation + +1. Install the [TPM] framework for tmux. + +[TPM]: https://github.com/tmux-plugins/tpm + +2. Add this line to your `~/.tmux.conf`: +```sh +set -g @plugin 'sunaku/tmux-navigate' +``` + +3. Configure your navigation shortcuts: +```sh +# if you're using QWERTY layout +set -g @navigate-left '-n M-h' +set -g @navigate-down '-n M-j' +set -g @navigate-up '-n M-k' +set -g @navigate-right '-n M-l' +set -g @navigate-back '-n M-\' + +# if you're using DVORAK layout +set -g @navigate-back '-n M-d' +set -g @navigate-left '-n M-h' +set -g @navigate-up '-n M-t' +set -g @navigate-down '-n M-n' +set -g @navigate-right '-n M-s' +``` + +4. Reload your tmux configuration file. + +5. Type prefix+I. + (This makes TPM install the plugin.) + +### Vim integration + +> Option 1: use your favorite Vim plugin manager +```vim +Plug 'sunaku/tmux-navigate' +``` + +> Option 2: symlink from your tmux plugins clone +```sh +mkdir -p ~/.vim/plugin/ +ln -s ~/.tmux/plugins/tmux-navigate/plugin/tmux-navigate.vim ~/.vim/plugin/ +``` + +## License + +[Spare A Life]: https://sunaku.github.io/vegan-for-life.html +> Like my work? 👍 Please [spare a life] today as thanks! 🐄🐖🐑🐔🐣🐟✨🙊✌ +> Why? For 💕 ethics, the 🌎 environment, and 💪 health; see link above. 🙇 + +(the ISC license) + +Copyright 2018 Suraj N. Kurapati + +Permission to use, copy, modify, and/or distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff --git a/dot_config/tmux/plugins/tmux-navigate/VERSION.md b/dot_config/tmux/plugins/tmux-navigate/VERSION.md new file mode 100644 index 0000000..b6d4479 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/VERSION.md @@ -0,0 +1,43 @@ +## Version 0.2.0 (2020-07-10) + +Minor: + + * Removed `@navigate-timeout` configuration setting. + + I have implemented proper edge detection (no more timeouts!) in the Vim + portion of this plugin by reporting navigable directions in Vim's title. + +Other: + + * Moved tmux navigation logic out of string literal. + + * Added documentation comments; improved formatting. + +## Version 0.1.1 (2020-05-06) + +Patch: + + * README: Vim integration required for local control. + + Since we rely on pane title changes to check whether Vim navigation was + successful, the included Vim plugin is also necessary for local control + (it's not only for remote control, where we connect to Vim through SSH). + + * GH-1: don't send BSpace upon Vim misidentification. + + For example, Vim 7.2 sets the pane title to "Thanks for flying Vim" and + doesn't bother to clean up after itself upon termination. As a result, + the old navigation logic would still see "Thanks for flying Vim" as the + title and think that Vim was still running: therefore misidentification. + +## Version 0.1.0 (2020-04-25) + +Minor: + + * Release [blog snippet] as a proper [TPM] plugin: `tmux-navigate`. + + Thanks to @bradleyharden for contributing a working example of TPM + plugin conversion and giving me the opportunity to host this repo. + +[TPM]: https://github.com/tmux-plugins/tpm +[blog snippet]: https://sunaku.github.io/tmux-select-pane.html diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/HEAD b/dot_config/tmux/plugins/tmux-navigate/dot_git/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/branches/.keep b/dot_config/tmux/plugins/tmux-navigate/dot_git/branches/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/config b/dot_config/tmux/plugins/tmux-navigate/dot_git/config new file mode 100644 index 0000000..a44b0fe --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/config @@ -0,0 +1,13 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[submodule] + active = . +[remote "origin"] + url = https://git::@github.com/sunaku/tmux-navigate + fetch = +refs/heads/master:refs/remotes/origin/master +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/description b/dot_config/tmux/plugins/tmux-navigate/dot_git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_applypatch-msg.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_applypatch-msg.sample new file mode 100644 index 0000000..a5d7b84 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_commit-msg.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_commit-msg.sample new file mode 100644 index 0000000..b58d118 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_fsmonitor-watchman.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_fsmonitor-watchman.sample new file mode 100644 index 0000000..23e856f --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_post-update.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_post-update.sample new file mode 100644 index 0000000..ec17ec1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-applypatch.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-applypatch.sample new file mode 100644 index 0000000..4142082 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-commit.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-commit.sample new file mode 100644 index 0000000..29ed5ee --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-merge-commit.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-merge-commit.sample new file mode 100644 index 0000000..399eab1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-push.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-push.sample new file mode 100644 index 0000000..4ce688d --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-rebase.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-rebase.sample new file mode 100644 index 0000000..6cbef5c --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-receive.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-receive.sample new file mode 100644 index 0000000..a1fd29e --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_prepare-commit-msg.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_prepare-commit-msg.sample new file mode 100644 index 0000000..10fa14c --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_push-to-checkout.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_push-to-checkout.sample new file mode 100644 index 0000000..af5a0c0 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_update.sample b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_update.sample new file mode 100644 index 0000000..c4d426b --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/hooks/executable_update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/index b/dot_config/tmux/plugins/tmux-navigate/dot_git/index new file mode 100644 index 0000000..1acea05 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-navigate/dot_git/index differ diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/info/exclude b/dot_config/tmux/plugins/tmux-navigate/dot_git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/HEAD b/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/HEAD new file mode 100644 index 0000000..4bf2828 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 27c83cd229bceff55e6318cce7945995623a6106 Hydroxycarbamide 1727090005 +0200 clone: from https://github.com/sunaku/tmux-navigate diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/refs/heads/master b/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/refs/heads/master new file mode 100644 index 0000000..4bf2828 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 27c83cd229bceff55e6318cce7945995623a6106 Hydroxycarbamide 1727090005 +0200 clone: from https://github.com/sunaku/tmux-navigate diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/refs/remotes/origin/HEAD b/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..4bf2828 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 27c83cd229bceff55e6318cce7945995623a6106 Hydroxycarbamide 1727090005 +0200 clone: from https://github.com/sunaku/tmux-navigate diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/info/.keep b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/info/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.idx b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.idx new file mode 100644 index 0000000..dcf2b67 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.idx differ diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.pack b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.pack new file mode 100644 index 0000000..1e98192 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.pack differ diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.rev b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.rev new file mode 100644 index 0000000..57a2daf Binary files /dev/null and b/dot_config/tmux/plugins/tmux-navigate/dot_git/objects/pack/readonly_pack-a5a3fbb7296989b1dca05181b524bc410681c9bc.rev differ diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/packed-refs b/dot_config/tmux/plugins/tmux-navigate/dot_git/packed-refs new file mode 100644 index 0000000..333015e --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +27c83cd229bceff55e6318cce7945995623a6106 refs/remotes/origin/master diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/heads/master b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/heads/master new file mode 100644 index 0000000..35cbdf8 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/heads/master @@ -0,0 +1 @@ +27c83cd229bceff55e6318cce7945995623a6106 diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/remotes/origin/HEAD b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.1.0 b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.1.0 new file mode 100644 index 0000000..b60d4f3 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.1.0 @@ -0,0 +1 @@ +73536d8a9ce9f6b5998b71b2ab988d5bac73805f diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.1.1 b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.1.1 new file mode 100644 index 0000000..9a01026 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.1.1 @@ -0,0 +1 @@ +053a2463efd4d5ba7558f81d7615090505a54df7 diff --git a/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.2.0 b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.2.0 new file mode 100644 index 0000000..8c187ff --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/dot_git/refs/tags/0.2.0 @@ -0,0 +1 @@ +31235174c7cd24721c7b64233ca975c5d7bf19f1 diff --git a/dot_config/tmux/plugins/tmux-navigate/executable_tmux-navigate.tmux b/dot_config/tmux/plugins/tmux-navigate/executable_tmux-navigate.tmux new file mode 100644 index 0000000..45bb3dc --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/executable_tmux-navigate.tmux @@ -0,0 +1,112 @@ +#!/bin/sh +# +# Intelligently navigate tmux panes and Vim splits using the same keys. +# This also supports SSH tunnels where Vim is running on a remote host. +# +# +-------------+------------+-----------------------------+ +# | inside Vim? | is Zoomed? | Action taken by key binding | +# +-------------+------------+-----------------------------+ +# | No | No | Focus directional tmux pane | +# | No | Yes | Nothing: ignore key binding | +# | Yes | No | Seamlessly focus Vim / tmux | +# | Yes | Yes | Focus directional Vim split | +# +-------------+------------+-----------------------------+ +# +# See https://sunaku.github.io/tmux-select-pane.html for documentation. + +get_tmux_option() { tmux show-option -gqv "$@" | grep . ;} + +navigate=$(sed '1,/^exit #.*$/d; s/^ *#.*//; /^$/d' "$0") +navigate_left=" $navigate L 'tmux select-pane -L' 'tmux send-keys C-w h'" +navigate_down=" $navigate D 'tmux select-pane -D' 'tmux send-keys C-w j'" +navigate_up=" $navigate U 'tmux select-pane -U' 'tmux send-keys C-w k'" +navigate_right="$navigate R 'tmux select-pane -R' 'tmux send-keys C-w l'" +navigate_back=" $navigate l 'tmux select-pane -l || tmux select-pane -t1'\ + 'tmux send-keys C-w p' \ + 'pane_is_zoomed' " + +for direction in left down up right back; do + option="@navigate-$direction" + handler="navigate_$direction" + if key=$(get_tmux_option "$option"); then + eval "action=\$$handler" # resolve handler variable + tmux bind-key $key run-shell -b ": $option; $action" + fi +done + +exit #------------------------------------------------------------------------ + +# interpolate tmux values ONCE at "compile time" +# (this is the reason for the double ## escapes) +pane_title="#{q:pane_title}" +pane_current_command="#{q:pane_current_command}" +window_zoomed_flag=#{window_zoomed_flag} + +pane_is_zoomed() { + test $window_zoomed_flag -eq 1 +} + +command_is_vim() { + case "${1%% *}" in + (vi|?vi|vim*|?vim*|view|?view|vi??*) + true + ;; + (*) + false + ;; + esac +} + +pane_contains_vim() { + command_is_vim "$pane_current_command" || + command_is_vim "$pane_title" +} + +pane_contains_neovim_terminal() { + case "$pane_title" in + (nvim?term://*) + true + ;; + (*) + false + ;; + esac +} + +navigate() { + tmux_navigation_direction=$1 + tmux_navigation_command=$2 + vim_navigation_command=$3 + vim_navigation_only_if=${4:-true} + + # try navigating Vim + if pane_contains_vim && eval "$vim_navigation_only_if"; then + + # parse navigable directions from Vim's title + vim_navigable_directions=${pane_title####* } + + # if desired direction is navigable in Vim... + case "l$vim_navigable_directions" in (*$tmux_navigation_direction*) + + # leave insert mode in NeoVim terminal + if pane_contains_neovim_terminal; then + tmux send-keys C-\\ C-n + fi + + # navigate Vim and don't fall through + eval "$vim_navigation_command" + return + + ;; + esac + + # otherwise fall through into tmux navigation + fi + + # try navigating tmux + if ! pane_is_zoomed; then + eval "$tmux_navigation_command" + fi +} + +navigate diff --git a/dot_config/tmux/plugins/tmux-navigate/plugin/tmux-navigate.vim b/dot_config/tmux/plugins/tmux-navigate/plugin/tmux-navigate.vim new file mode 100644 index 0000000..0b60a4a --- /dev/null +++ b/dot_config/tmux/plugins/tmux-navigate/plugin/tmux-navigate.vim @@ -0,0 +1,30 @@ +" +" Intelligently navigate tmux panes and Vim splits using the same keys. +" This also supports SSH tunnels where Vim is running on a remote host. +" +" See https://sunaku.github.io/tmux-select-pane.html for documentation. + +function! TmuxNavigateDirections() abort + let [y, x] = win_screenpos('.') + let h = winheight('.') + let w = winwidth('.') + + let can_go_up = y > 2 " +1 for the tabline + let can_go_down = y + h < &lines - &laststatus + let can_go_left = x > 1 + let can_go_right = x + w < &columns + + return + \ (can_go_up ? 'U' : '') . + \ (can_go_down ? 'D' : '') . + \ (can_go_left ? 'L' : '') . + \ (can_go_right ? 'R' : '') +endfunction + +let progname = substitute($VIM, '.*[/\\]', '', '') +set title titlestring=%{progname}\ %f\ #%{TmuxNavigateDirections()} + +" enable support for setting the window title in regular Vim under tmux +if &term =~ '^screen' && !has('nvim') + execute "set t_ts=\e]2; t_fs=\7" +endif diff --git a/dot_config/tmux/plugins/tmux-session-wizard/Dockerfile b/dot_config/tmux/plugins/tmux-session-wizard/Dockerfile new file mode 100644 index 0000000..fa61e3b --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/Dockerfile @@ -0,0 +1,34 @@ +# syntax = docker/dockerfile:1.4 +FROM nixos/nix:2.22.0 AS builder + +WORKDIR /tmp/build +RUN mkdir /tmp/nix-store-closure +COPY . . + +RUN \ + --mount=type=cache,target=/nix,from=nixos/nix:2.22.0,source=/nix \ + --mount=type=cache,target=/root/.cache \ + --mount=type=bind,target=/tmp/build \ + < + +One prefix key to rule them all (with [fzf](https://github.com/junegunn/fzf) & [zoxide](https://github.com/ajeetdsouza/zoxide)): + +- Creating a new session from a list of recently accessed directories +- Naming a session after a directory/project +- Switching sessions +- Viewing current or creating new sessions in one popup + +### Elevator Pitch + +Tmux is powerful, yes, but why is creating/switching sessions (arguably its main feature) is so damn hard to do? To create a new session for a project you have to run `tmux new-session -s -c `. What if you're inside tmux? Oh, wait you have to use `-d` followed by `tmux switch-client -t `. Oh, wait again! What if you're outside tmux and you want to attach to an existing session? now you have to run `tmux attach -t ` instead. What if you can't remember whether you have a session for that project or not. Guess what? Now you have to run `tmux has-session -t `. What if your project folder contains characters not accepted by tmux as a session name? What if you want to show a list of existing sessions? You run `tmux list-sessions`. What if you want to create a session for a project you've recently navigated to? What if, what if, what if.... HOW IS THAT BETTER THAN HAVING 20 TERMINAL WINDOWS OPEN? + +What if you could use 1 prefix key to do all of this? Read on! + +### Features + +`prefix + T` (customisable) - displays a pop-up with [fzf](https://github.com/junegunn/fzf) which displays the existing sessions followed by recently accessed directories (using [zoxide](https://github.com/ajeetdsouza/zoxide)). Choose the session or the directory and voila! You're in that session. If the session doesn't exist, it will be created. + +### Required + +You must have [fzf](https://github.com/junegunn/fzf), [zoxide](https://github.com/ajeetdsouza/zoxide) installed and available in your path. + +### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended) + +Add plugin to the list of TPM plugins in `.tmux.conf`: + +```tmux +set -g @plugin '27medkamal/tmux-session-wizard' +``` + +Hit `prefix + I` to fetch the plugin and source it. That's it! + +### Manual Installation + +Clone the repo: + + git clone https://github.com/27medkamal/tmux-session-wizard ~/clone/path + +Add this line to the bottom of `.tmux.conf`: + +```tmux +run-shell ~/clone/path/tmux-session-wizard.tmux +``` + +Reload TMUX environment with `$ tmux source-file ~/.tmux.conf`, and that's it. + +### Customisation + +You can customise the prefix key by adding this line to your `.tmux.conf`: + +```tmux +set -g @session-wizard 'T' +set -g @session-wizard 'T K' # for multiple key bindings +``` + +You can also customise the height and width of the tmux popup by adding the follwing lines to your `.tmux.conf`: + +```tmux +set -g @session-wizard-height 40 +set -g @session-wizard-width 80 +``` + +To customise the way session names are created, use `@session-wizard-mode` option. Allowed values are: + +- `directory` (default) +- `full-path` +- `short-path` + +```tmux +set -g @session-wizard-mode "full-path" +``` + +By default, `tmux-session-wizard` gives you a list of open sessions (hence the name). An alternative is that it gives you a list of _windows_ to choose from. This can be turned on using the setting `@session-wizard-windows`. Add this line to your `.tmux.conf` to enable this behaviour: + +```tmux +set -g @session-wizard-windows on # default is off +``` + +### (Optional) Using the script outside of tmux + +**Note:** you'll need to check the path of your tpm plugins. It may be `~/.tmux/plugins` or `~/.config/tmux/plugins` depending on where your `tmux.conf` is located. + +
+bash + +Add the following line to `~/.bashrc` + +```sh +# ~/.tmux/plugins +export PATH=$HOME/.tmux/plugins/tmux-session-wizard/bin:$PATH +# ~/.config/tmux/plugins +export PATH=$HOME/.config/tmux/plugins/tmux-session-wizard/bin:$PATH +``` + +
+ +
+zsh + +Add the following line to `~/.zprofile` + +```sh +# ~/.tmux/plugins +export PATH=$HOME/.tmux/plugins/tmux-session-wizard/bin:$PATH +# ~/.config/tmux/plugins +export PATH=$HOME/.config/tmux/plugins/tmux-session-wizard/bin:$PATH +``` + +
+ +
+fish + +Add the following line to `~/.config/fish/config.fish` + +```fish +# ~/.tmux/plugins +fish_add_path $HOME/.tmux/plugins/tmux-session-wizard/bin +# ~/.config/tmux/plugins +fish_add_path $HOME/.config/tmux/plugins/tmux-session-wizard/bin +``` + +
+ +You can then run `t` from anywhere to use the script. + +You can also run `t` with a relative or absolute path to a directory (similar to [zoxide](https://github.com/ajeetdsouza/zoxide)) to create a session for that directory. For example, `t ~/projects/my-project` will create a session named `my-project` and cd into that directory. + +Also, depending on the terminal emulator you use, you can make it always start what that script. + +### Development + +The development environment is built with Nix and Nix's Flakes, if you have it on your system then just run `nix develop` and you are ready to go. Other method is to build the Docker image based on provided Dockerfile: + +```bash +docker build --tag tmux-session-wizard:dev --file ./Dockerfile . +``` + +To run the tests, just run `bats ./tests` for local development environment or `docker run --rm -it -u $(id -u):$(id -g) -v $PWD:$PWD -w $PWD tmux-session-wizard:dev bats ./tests` if you are using Docker. + +There is also the helper script for it _./scripts/run-tests.sh_, run `./scripts/run-tests.sh -h` to get more information about usage. + +### Inspiration + +- ThePrimeagen's [tmux-sessionizer](https://github.com/ThePrimeagen/.dotfiles/blob/master/bin/.local/scripts/tmux-sessionizer) +- Josh Medeski's [t-smart-tmux-session-manager](https://github.com/joshmedeski/t-smart-tmux-session-manager) + +### License + +[MIT](LICENCE.md) diff --git a/dot_config/tmux/plugins/tmux-session-wizard/bin/executable_t b/dot_config/tmux/plugins/tmux-session-wizard/bin/executable_t new file mode 100644 index 0000000..683c464 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/bin/executable_t @@ -0,0 +1,89 @@ +#!/bin/bash + +CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "$CURRENT_DIR/../src/helpers.sh" + +# Usage: t +# If no argument is given, a combination of existing sessions and a zoxide query will be displayed in a FZF + +# Parse optional argument +if [ "$*" ]; then + # Argument is given + eval "$(zoxide init bash)" + RESULT=$(z "$*" && pwd) +else + # No argument is given. Use FZF + SELECT_WINDOW=$(get_tmux_option "@session-wizard-windows" "off") + if [ "$SELECT_WINDOW" == "on" ]; then + RESULT=$(tmux list-windows -a -F "#{session_last_attached} #{session_name}: #{window_name}(#{window_index})\ +#{?session_grouped, (group ,}#{session_group}#{?session_grouped,),}#{?session_attached,#{?window_active, (attached),},}") + else + RESULT=$(tmux list-sessions -F "#{session_last_attached} #{session_name}: #{session_windows} window(s)\ +#{?session_grouped, (group ,}#{session_group}#{?session_grouped,),}#{?session_attached, (attached),}") + fi + RESULT=$( ( + echo "$RESULT" | + sort -r | (if [ -n "$TMUX" ]; then grep -v " $(tmux display-message -p '#S'):"; else cat; fi) | cut -d' ' -f2- + zoxide query -l | sed -e "$HOME_REPLACER" + ) | $(__fzfcmd) --reverse --print-query --tiebreak=index | tail -n 1) + if [ -z "$RESULT" ]; then + exit 0 + fi +fi + +# Makes sure tmux is running in order to get all the correct tmux options below. Gets cleaned at the bottom +if ! tmux info &>/dev/null; then + TMP_SESSION_DIR=$(mktemp -d) + TMP_SESSION_NAME=$(session_name --full-path "$TMP_SESSION_DIR") + tmux new-session -d -s "$TMP_SESSION_NAME" -c "$TMP_SESSION_DIR" +fi + +# Get or create session +if [[ $RESULT == *":"* ]]; then + # RESULT comes from list-sessions or list-windows + SESSION=$(echo "$RESULT" | awk '{print $1}') + SESSION=${SESSION//:/} + if [ "$SELECT_WINDOW" == "on" ]; then + WINDOW=$(echo "$RESULT" | awk -F"[()]" '{print $(NF-1)}') + fi +else + # RESULT is a path + + DIR_FULL=$(echo "$RESULT" | sed -e "$TILDE_REPLACER") + DIR_WITH_TILDE=$(echo "$RESULT" | sed -e "$HOME_REPLACER") # in case it came from a direct usage of `t ` + + # Quit if directory does not exists + if [ ! -d "$DIR_FULL" ]; then + exit 0 + fi + + # Promote rank in zoxide. + zoxide add "$DIR_FULL" + + MODE=$(get_tmux_option "@session-wizard-mode" "directory") + SESSION=$(session_name --"$MODE" "$DIR_WITH_TILDE") + + if ! tmux has-session -t="$SESSION" 2>/dev/null; then + tmux new-session -d -s "$SESSION" -c "$DIR_FULL" + fi +fi + +# Clean up tmp session +if [[ -n "$TMP_SESSION_NAME" ]]; then + tmux kill-session -t "$TMP_SESSION_NAME" 2>/dev/null + rm -rf "$TMP_SESSION_DIR" +fi + +# Attach to session +# Escape tilde which if it appears by itself, tmux will interpret as a marked target +# https://github.com/tmux/tmux/blob/master/cmd-find.c#L1024C51-L1024C57 +SESSION=$(echo "$SESSION" | sed 's/^~$/\\~/') +if [ -z "$TMUX" ]; then + tmux attach -t "$SESSION" +else + tmux switch-client -t "$SESSION" +fi + +if [ -n "$WINDOW" ]; then + tmux select-window -t "$SESSION:$WINDOW" +fi diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/HEAD b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/HEAD new file mode 100644 index 0000000..b870d82 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/main diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/branches/.keep b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/branches/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/config b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/config new file mode 100644 index 0000000..3adb933 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/config @@ -0,0 +1,13 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[submodule] + active = . +[remote "origin"] + url = https://git::@github.com/27medkamal/tmux-session-wizard + fetch = +refs/heads/main:refs/remotes/origin/main +[branch "main"] + remote = origin + merge = refs/heads/main diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/description b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_applypatch-msg.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_applypatch-msg.sample new file mode 100644 index 0000000..a5d7b84 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_commit-msg.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_commit-msg.sample new file mode 100644 index 0000000..b58d118 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_fsmonitor-watchman.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_fsmonitor-watchman.sample new file mode 100644 index 0000000..23e856f --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_post-update.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_post-update.sample new file mode 100644 index 0000000..ec17ec1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-applypatch.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-applypatch.sample new file mode 100644 index 0000000..4142082 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-commit.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-commit.sample new file mode 100644 index 0000000..29ed5ee --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-merge-commit.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-merge-commit.sample new file mode 100644 index 0000000..399eab1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-push.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-push.sample new file mode 100644 index 0000000..4ce688d --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-rebase.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-rebase.sample new file mode 100644 index 0000000..6cbef5c --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-receive.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-receive.sample new file mode 100644 index 0000000..a1fd29e --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_prepare-commit-msg.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_prepare-commit-msg.sample new file mode 100644 index 0000000..10fa14c --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_push-to-checkout.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_push-to-checkout.sample new file mode 100644 index 0000000..af5a0c0 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_update.sample b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_update.sample new file mode 100644 index 0000000..c4d426b --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/hooks/executable_update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/index b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/index new file mode 100644 index 0000000..5ede7aa Binary files /dev/null and b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/index differ diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/info/exclude b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/HEAD b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/HEAD new file mode 100644 index 0000000..e7197e1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9c6b5dc612e635352a89f86c836b4532d6696e95 Hydroxycarbamide 1727090006 +0200 clone: from https://github.com/27medkamal/tmux-session-wizard diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/refs/heads/main b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/refs/heads/main new file mode 100644 index 0000000..e7197e1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/refs/heads/main @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9c6b5dc612e635352a89f86c836b4532d6696e95 Hydroxycarbamide 1727090006 +0200 clone: from https://github.com/27medkamal/tmux-session-wizard diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/refs/remotes/origin/HEAD b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..e7197e1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 9c6b5dc612e635352a89f86c836b4532d6696e95 Hydroxycarbamide 1727090006 +0200 clone: from https://github.com/27medkamal/tmux-session-wizard diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/info/.keep b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/info/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.idx b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.idx new file mode 100644 index 0000000..01dbf26 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.idx differ diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.pack b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.pack new file mode 100644 index 0000000..29985eb Binary files /dev/null and b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.pack differ diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.rev b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.rev new file mode 100644 index 0000000..ffc5ed7 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/objects/pack/readonly_pack-3a4505d27f37d8283943b7c667d2f9397d849dd5.rev differ diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/packed-refs b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/packed-refs new file mode 100644 index 0000000..a417900 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +9c6b5dc612e635352a89f86c836b4532d6696e95 refs/remotes/origin/main diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/heads/main b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/heads/main new file mode 100644 index 0000000..049fce5 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/heads/main @@ -0,0 +1 @@ +9c6b5dc612e635352a89f86c836b4532d6696e95 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/remotes/origin/HEAD b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/remotes/origin/HEAD new file mode 100644 index 0000000..4b0a875 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/main diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.0.0 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.0.0 new file mode 100644 index 0000000..68ba2fe --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.0.0 @@ -0,0 +1 @@ +3f84b46ada2ac1624c3524c4c477bbed65c06d78 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.1.0 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.1.0 new file mode 100644 index 0000000..57d96d0 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.1.0 @@ -0,0 +1 @@ +a61962def77db987833c4245e95f60eb1944ceae diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.2.0 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.2.0 new file mode 100644 index 0000000..e4a44f9 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.2.0 @@ -0,0 +1 @@ +27a2bfa4f89ab49a99ce578a22c6e00d18b109cf diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.3.0 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.3.0 new file mode 100644 index 0000000..51df115 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.3.0 @@ -0,0 +1 @@ +d4041f839bc6e9d7c414ee5c66c705d496fa342f diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.3.1 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.3.1 new file mode 100644 index 0000000..2d9b4e3 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.3.1 @@ -0,0 +1 @@ +315b88cd6bf04c7fcb72fc34239edd682dcfc798 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.4.0 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.4.0 new file mode 100644 index 0000000..a138031 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/V1.4.0 @@ -0,0 +1 @@ +1047b3eb336ce24d883e48b9debaa26e20442547 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/v1.0.0 b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/v1.0.0 new file mode 100644 index 0000000..68ba2fe --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_git/refs/tags/v1.0.0 @@ -0,0 +1 @@ +3f84b46ada2ac1624c3524c4c477bbed65c06d78 diff --git a/dot_config/tmux/plugins/tmux-session-wizard/dot_gitignore b/dot_config/tmux/plugins/tmux-session-wizard/dot_gitignore new file mode 100644 index 0000000..3e05054 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/dot_gitignore @@ -0,0 +1,7 @@ +# IDE +.idea + +# Nix +.envrc +.direnv +result diff --git a/dot_config/tmux/plugins/tmux-session-wizard/executable_session-wizard.tmux b/dot_config/tmux/plugins/tmux-session-wizard/executable_session-wizard.tmux new file mode 100644 index 0000000..f126e53 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/executable_session-wizard.tmux @@ -0,0 +1,30 @@ +#!/usr/bin/env bash + +CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" +source "$CURRENT_DIR/src/helpers.sh" + +default_key_bindings_session_wizard="T" +tmux_option_session_wizard="@session-wizard" +tmux_option_session_wizard_height="@session-wizard-height" +default_height=40 +tmux_option_session_wizard_width="@session-wizard-width" +default_width=80 + +# Multiple bindings can be set. Default binding is "T". +set_session_wizard_options() { + local key_bindings + key_bindings=$(get_tmux_option "$tmux_option_session_wizard" "$default_key_bindings_session_wizard") + local height + height=$(get_tmux_option "$tmux_option_session_wizard_height" "$default_height") + local width + width=$(get_tmux_option "$tmux_option_session_wizard_width" "$default_width") + local key + for key in $(echo "${key_bindings}" | sed 's/ /\n/g'); do + tmux bind "$key" display-popup -w "$width"% -h "$height"% -E "$CURRENT_DIR/bin/t" + done +} + +function main { + set_session_wizard_options +} +main diff --git a/dot_config/tmux/plugins/tmux-session-wizard/flake.lock b/dot_config/tmux/plugins/tmux-session-wizard/flake.lock new file mode 100644 index 0000000..11adba7 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1707743206, + "narHash": "sha256-AehgH64b28yKobC/DAWYZWkJBxL/vP83vkY+ag2Hhy4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2d627a2a704708673e56346fcb13d25344b8eaf3", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/dot_config/tmux/plugins/tmux-session-wizard/flake.nix b/dot_config/tmux/plugins/tmux-session-wizard/flake.nix new file mode 100644 index 0000000..3aaf5c7 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/flake.nix @@ -0,0 +1,48 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; + flake-utils.url = "github:numtide/flake-utils"; + }; + + outputs = { self, nixpkgs, flake-utils, ... }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = nixpkgs.legacyPackages.${system}; + devPackages = [ + (pkgs.bats.withLibraries (p: [ p.bats-support p.bats-assert ])) + pkgs.watchexec + ]; + plugin = pkgs.tmuxPlugins.mkTmuxPlugin { + pluginName = "session-wizard"; + rtpFilePath = "session-wizard.tmux"; + version = "unstable"; + src = self; + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + ls -al $target && \ + substituteInPlace $target/session-wizard.tmux \ + --replace \$CURRENT_DIR/bin/t $target/bin/t + wrapProgram $target/bin/t \ + --prefix PATH : ${with pkgs; lib.makeBinPath ([ fzf zoxide coreutils gnugrep gnused ])} + ''; + }; + in + { + packages.dev = (pkgs.symlinkJoin + { + name = "dev-environment"; + paths = [ + plugin + plugin.buildInputs + pkgs.tmux + pkgs.bashInteractive + pkgs.busybox + ] ++ devPackages; + }); + + devShell = pkgs.mkShell { + buildInputs = devPackages; + }; + } + ); +} diff --git a/dot_config/tmux/plugins/tmux-session-wizard/scripts/executable_run-tests.sh b/dot_config/tmux/plugins/tmux-session-wizard/scripts/executable_run-tests.sh new file mode 100644 index 0000000..ec353fc --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/scripts/executable_run-tests.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env bash +# For debugging purposes +# set -x + +PROJECT_ROOT="$(dirname "$(dirname "$(realpath "$0")")")" +IMAGE="tmux-session-wizard:dev" + +while getopts "crwh" opt; do + case $opt in + c) CONTAINER=true + ;; + r) REBUILD=true + ;; + w) WATCH=true + ;; + h) + echo "Usage: run-tests.sh" + echo "Run tests for the project" + echo " -c Run tests inside a container (image: ${IMAGE})" + echo " -r Rebuild the container image before running tests, set also -c opiton by default" + echo " -w Watch changes in project and then run tests" + echo " -h Display this help message" + exit 0 + ;; + \?) + echo "Invalid option: -$OPTARG" >&2 + exit 1 + ;; + esac +done + +# Basic command to run tests +CMD=(bats "$PROJECT_ROOT/tests") + +# Run tests in watch mode +if [ "$WATCH" = true ]; then + CMD=(watchexec "${CMD[@]}") +fi + +# Run tests inside a container +if [ "$CONTAINER" = true ] || [ "$REBUILD" = true ]; then + CMD=(docker run --rm -it --user "$(id -u):$(id -g)" -v "$PROJECT_ROOT:$PROJECT_ROOT" -w "$PROJECT_ROOT" "$IMAGE" "${CMD[@]}") + IS_IMAGE_EXISTS=$(docker images -q ${IMAGE}) +fi + +if [ -z "$IS_IMAGE_EXISTS" ] && [ "$CONTAINER" = true ] || [ "$REBUILD" = true ] ; then + docker build -t ${IMAGE} -f "$PROJECT_ROOT/Dockerfile" "$PROJECT_ROOT" +fi + +echo "----------------------------------------------------------------------------" +echo "Running tests with command: ${CMD[*]}" +echo "----------------------------------------------------------------------------" +"${CMD[@]}" + + diff --git a/dot_config/tmux/plugins/tmux-session-wizard/src/helpers.sh b/dot_config/tmux/plugins/tmux-session-wizard/src/helpers.sh new file mode 100644 index 0000000..5ec6abd --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/src/helpers.sh @@ -0,0 +1,46 @@ +_normalize() { + cat | tr ' .:' '-' | tr '[:upper:]' '[:lower:]' +} + +# helper functions +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 +} + +session_name() { + if [ "$1" = "--directory" ]; then + shift + basename "$@" | _normalize + elif [ "$1" = "--full-path" ]; then + shift + echo "$@" | _normalize | sed 's/\/$//' + elif [ "$1" = "--short-path" ]; then + shift + echo "$(echo "${@%/*}" | sed -r 's;/([^/]{1,2})[^/]*;/\1;g' | _normalize)/$(basename "$@" | _normalize)" + else + echo "Wrong argument, you can use --directory, --full-path or --short-path, got $1" + return 1 + fi +} + +HOME_REPLACER="" # default to a noop +TILDE_REPLACER="" # default to a noop +echo "$HOME" | grep -E "^[a-zA-Z0-9\-_/.@]+$" &>/dev/null # chars safe to use in sed +HOME_SED_SAFE=$? +if [ $HOME_SED_SAFE -eq 0 ]; then # $HOME should be safe to use in sed + HOME_REPLACER="s|^$HOME|~|" + TILDE_REPLACER="s|^~|$HOME|" +fi + +__fzfcmd() { + [ -n "$TMUX_PANE" ] && { [ "${FZF_TMUX:-0}" != 0 ] || [ -n "$FZF_TMUX_OPTS" ]; } && + echo "fzf-tmux ${FZF_TMUX_OPTS:--d${FZF_TMUX_HEIGHT:-40%}} -- " || echo "fzf" +} diff --git a/dot_config/tmux/plugins/tmux-session-wizard/tests/helpers.bats b/dot_config/tmux/plugins/tmux-session-wizard/tests/helpers.bats new file mode 100644 index 0000000..d140235 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-session-wizard/tests/helpers.bats @@ -0,0 +1,51 @@ +setup() { + bats_load_library 'bats-support' + bats_load_library 'bats-assert' + DIR="$(cd "$(dirname "$BATS_TEST_FILENAME")" >/dev/null 2>&1 && pwd)" + SRC_DIR="$DIR/../src" + source "$SRC_DIR/helpers.sh" + TEST_PATH="/MOO/.foo BAR/.moo FOO-bar.baz" +} + +unset() { + unset TEST_PATH +} + +# TODO: use better stubbing for tmux (tmux show-option) +@test "get tmux option with default value" { + # stub tmux + function tmux() { + assert_equal "$1" "show-option" + assert_equal "$3" "moo-foo-bar" + } + run get_tmux_option "moo-foo-bar" "bar" + assert_output "bar" +} + +@test "get tmux option with value" { + # stub tmux + function tmux() { + assert_equal "$1" "show-option" + assert_equal "$3" "moo-foo-bar" + # option value is set to "foo" + echo "foo" + } + run get_tmux_option "moo-foo-bar" "bar" + assert_output "foo" +} + +@test "create session name with last directory in path" { + run session_name --directory "$TEST_PATH" + assert_output "-moo-foo-bar-baz" +} + +@test "create session name with full path" { + run session_name --full-path "$TEST_PATH" + assert_output "/moo/-foo-bar/-moo-foo-bar-baz" +} + +@test "create session name with shortened path and last directory in path" { + run session_name --short-path "$TEST_PATH" + assert_output "/mo/-f/-moo-foo-bar-baz" +} + diff --git a/dot_config/tmux/plugins/tmux-tilish/LICENSE b/dot_config/tmux/plugins/tmux-tilish/LICENSE new file mode 100644 index 0000000..d808dbf --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2020 Jabir Ali Ouassou + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/dot_config/tmux/plugins/tmux-tilish/README.md b/dot_config/tmux/plugins/tmux-tilish/README.md new file mode 100644 index 0000000..5349505 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/README.md @@ -0,0 +1,327 @@ +# Tmux Tilish + +This is a plugin that makes [`tmux`][6] behave more like a typical +[dynamic window manager][7]. It is heavily inspired by [`i3wm`][8], and +most keybindings are taken [directly from there][1]. However, I have made +some adjustments to make these keybindings more consistent with `vim`: +using hjkl instead of +jkl; for directions, and +using `vim`'s definitions of "split" and "vsplit". There is also an +"easy mode" available for non-`vim` users, which uses arrow keys +instead of hjkl. + +The plugin has been verified to work on `tmux` v1.9, v2.6, v2.7, v2.9, and v3.0. +Some features are only available on newer versions of `tmux` (currently v2.7+), +but I hope to provide at least basic support for most `tmux` versions in active use. +If you encounter any problems, please file an issue and I'll try to look into it. + +[1]: https://i3wm.org/docs/refcard.html +[6]: https://github.com/tmux/tmux/wiki/Getting-Started +[7]: https://en.wikipedia.org/wiki/Dynamic_window_manager +[8]: https://i3wm.org/docs/ + +## Why? + +Okay, so who is this plugin for anyway? You may be interested in this if: + +- You're using or interested in using `tmux`, but find the default keybindings + a bit clunky. This lets you try out an alternative keybinding paradigm, + which uses a modifier key (Alt) instead of a prefix key + (Ctrl + b). The plugin also makes it easier to do + automatic tiling via `tmux` layouts, as opposed to splitting panes manually. +- You use `i3wm`, but also do remote work over `ssh` + `tmux`. This lets + you use similar keybindings in both contexts. +- You also use other platforms like Gnome, Mac, or WSL. You want to take + your `i3wm` muscle memory with you via `tmux`. +- You're not really using `i3wm` anymore, but you did like how it handled + terminals and workspaces. You'd like to keep working that way in terminals, + without using `i3wm` or `sway` for your whole desktop. +- You use a window manager that is similar to `i3wm`, e.g. [`dwm`][9], + and want to have that workflow in `tmux` too. + +[9]: https://dwm.suckless.org/tutorial/ + +## Quickstart + +The easiest way to install this plugin is via the [Tmux Plugin Manager][2]. +Just add the following to `~/.tmux.conf`, then press Ctrl + b +followed by Shift + i to install it (assuming default prefix key): + + set -g @plugin 'jabirali/tmux-tilish' + +For `tmux` v2.7+, you can customize which layout is used as default for new workspaces. +To do so, add this to `~/.tmux.conf`: + + set -g @tilish-default 'main-vertical' + +Just replace `main-vertical` with one of the layouts from the `tmux` `man` page: + +| Description | Name | +| ----------------- | ----------------- | +| split then vsplit | `main-horizontal` | +| only split | `even-vertical` | +| vsplit then split | `main-vertical` | +| only vsplit | `even-horizontal` | +| fully tiled | `tiled` | + +The words "split" and "vsplit" refer to the layouts you get in `vim` when +running `:split` and `:vsplit`, respectively. (Unfortunately, what is called +a "vertical" and "horizontal" split varies between programs.) +If you do not set this option, `tilish` will not autoselect any layout; you +can still choose layouts manually using the keybindings listed below. + +After performing the steps above, you should read the [list of keybindings](#keybindings). +For further configuration options: + +- If you use `nvim` or `vim`, consider [integrating it with `tilish`](#integration-with-vim). +- If you do not use `vim` or `kak`, consider activating [easy mode](#easy-mode). +- If you use `kak` or `emacs`, consider activating [prefix mode](#prefix-mode). +- If you use `tmux` within `i3wm` or `sway`, see [this section](#usage-inside-i3wm). +- If you like `dmenu`, check out the [application launcher](#application-launcher). +- If it doesn't work, check your [terminal settings](#terminal-compatibility). + +It is also recommended that you add the following to the top of your `.tmux.conf`: + + set -s escape-time 0 + set -g base-index 1 + +The first line prevents e.g. Esc + h from triggering the +Alt + h keybinding, preventing common misbehavior when +using `vim` in `tmux`. This option is automatically set by [tmux-sensible][4], if +you use that. The second line makes workspace numbers go from 1-10 instead of 0-9, +which makes more sense on a keyboard where the number row starts at 1. However, +`tilish` explicitly checks this setting when mapping keys, and works fine without it. + +[2]: https://github.com/tmux-plugins/tpm +[4]: https://github.com/tmux-plugins/tmux-sensible + +## Keybindings + +Finally, here is a list of the actual keybindings. Most are [taken from `i3wm`][1]. +Below, a "workspace" is what `tmux` would call a "window" and `vim` would call a "tab", +while a "pane" is what `i3wm` would call a "window" and `vim` would call a "split". + +| Keybinding | Description | +| ---------- | ----------- | +| Alt + 0-9 | Switch to workspace number 0-9 | +| Alt + Shift + 0-9 | Move pane to workspace 0-9 | +| Alt + hjkl | Move focus left/down/up/right | +| Alt + Shift + hjkl | Move pane left/down/up/right | +| Alt + o | Move focus to next pane | +| Alt + Enter | Create a new pane at "the end" of the current layout | +| Alt + s | Switch to layout: split then vsplit | +| Alt + Shift + s | Switch to layout: only split | +| Alt + v | Switch to layout: vsplit then split | +| Alt + Shift + v | Switch to layout: only vsplit | +| Alt + t | Switch to layout: fully tiled | +| Alt + z | Switch to layout: zoom (fullscreen) | +| Alt + r | Refresh current layout | +| Alt + n | Name current workspace | +| Alt + Shift + q | Quit (close) pane | +| Alt + Shift + e | Exit (detach) `tmux` | +| Alt + Shift + c | Reload config | + +The Alt + 0 and Alt + Shift + 0 +bindings are "smart": depending on `base-index`, they either act on workspace 0 or 10. + +The keybindings that move panes between workspaces assume a US keyboard layout. +However, you can configure `tilish` for international keyboards by providing a string +`@tilish-shiftnum` prepared by pressing Shift + +1234567890. +For instance, for a UK keyboard, you would configure it as follows: + + set -g @tilish-shiftnum '!"£$%^&*()' + +Your terminal must support sending keycodes like `M-£` for the above to work. +For instance, a UK keyboard layout works fine on `urxvt`, but does not work +by default on `kitty` or `alacritty`, which may require additional configuration. + +## Easy mode + +To make the plugin more accessible for people who do not use `vim` as well, +there is also an "easy mode" available, which uses arrow keys instead of +the `vim`-style hjkl keys. +This mode can be activated by putting this in your `.tmux.conf`: + + set -g @tilish-easymode 'on' + +The revised keybindings for the pane focus and movement then become: + +| Keybinding | Description | +| ---------- | ----------- | +| Alt + ←↓↑→ | Move focus left/down/up/right | +| Alt + Shift + ←↓↑→ | Move pane left/down/up/right | + +## Prefix mode +Note that this feature is currently only available in `tmux` v2.4+. +The "prefix mode" uses a prefix key instead of Alt, and +may be particularly interesting for users of editors like `kak` and +`emacs` that use Alt key a lot. To activate this mode, you +define a prefix keybinding in your `tmux.conf`. For instance, to use +Alt + Space as your `tilish` prefix, add: + + set -g @tilish-prefix 'M-space' + +Actions that would usually be done by Alt + key +are now accomplished by pressing the prefix and then key. +For example, opening a split is usually Alt + Enter, +but with the above prefix this becomes Alt + Space +then Enter. Note that the `tilish` prefix is different from +the `tmux` prefix, and should generally be bound to a different key. +For the prefix key, you can choose basically any keybinding that `tmux` +supports, e.g. `F12` or `C-s` or anything else you may prefer. + +All these keybindings are `repeat`'able, so you do not have to press the +prefix key again if you type multiple commands fast enough. Thus, pressing +Alt + Space followed by hj would +move to the left and then down, without requiring another prefix activation. +The `tmux` option `repeat-time` can be used to customize this timeout. +Personally, I find the default 500ms timeout somewhat short, and would +recommend that you increase this to at least a second if you use `tilish`: + + set -g repeat-time 1000 + +## Application launcher + +In `i3wm`, the keybinding Alt+d is by default mapped to +the application launcher `dmenu`, which can be practical to quickly open apps. +If you have [`fzf`][5] available on your system, `tilish` can offer a similar +application launcher using the same keyboard shortcut. To enable this +functionality, add the following to your `~/.tmux.conf`: + + set -g @tilish-dmenu 'on' + +Basically, pressing Alt+d will then pop up a split +that lets you fuzzy-search through all executables in your system `$PATH`. +Selecting an executable runs the command in that split. When you want +to start an interactive process, this can be more convenient than +using Alt+Enter and typing the command name. +This is currently only available in `tmux` v2.7+. + +[5]: https://github.com/junegunn/fzf + +## Terminal compatibility + +Not all terminals support all keybindings. The plugin has been verified +to work well with: `iTerm2` and `Terminal.app` on macOS; `alacritty`, `kitty`, +`terminator`, `gnome-terminal`, and `urxvt` on Linux; `wsltty` and `alacritty` +on Windows. Some of these terminals bind Alt+Enter to +fullscreen, so you have to disable that for the `tilish` "new pane" binding to +work. Moreover, `gnome-terminal` steals the "switch workspace" keybindings +Alt+0-9 *if* you open multiple tabs. If you +use macOS, you likely want to configure the `Option` key to send either `Esc+` +(`iTerm2`) or `Meta` (`Terminal.app`) under the keyboard settings of the app. + +It is also worth noting that `iTerm2` allows you to swap the `Cmd` and `Option` +keys in the terminal app. I recommend giving this a try if you're on macOS, +since the `Cmd` is more ergonomic than the `Option` key for extended use. + +If you use `xterm`, almost none of the Alt keys work by default. +That can be fixed by adding this to `~/.Xresources`: + + XTerm*eightBitControl: false + XTerm*eightBitInput: false + XTerm.omitTranslation: fullscreen + XTerm*fullscreen: never + +The same issue affects Alacritty on macOS; see +[this issue](https://github.com/alacritty/alacritty/issues/93#issuecomment-353489475) +for a proposed solution. + +## Usage inside i3wm + +If you use `tilish` inside `i3wm` or `sway`, keybindings like +Alt+Enter may spawn a new terminal in your window manager +instead of a new terminal pane inside `tmux`. The window manager always takes +priority — so if both `i3wm` and `tilish` define the same keybinding, +`i3wm` will intercept the keybinding before `tmux` sees it. + +The best way to solve this is perhaps to change your window manager modifier key +to Super, also known as the "Windows key". As described +[in the `i3wm` user guide](https://i3wm.org/docs/userguide.html#_using_i3), this can +be done by changing `$mod` to `Mod4` in your `i3wm` config. That way, pressing e.g. +Alt+Enter opens a new terminal pane inside `tmux`, while +Super+Enter opens a new terminal in `i3wm`. + +Alternatively, `tilish` also supports a [Prefix mode](#prefix-mode). This is in my opinion +less ergonomic than the default `tilish` keybindings. However, it does not require the use +of Alt, and is therefore compatible with the default `i3wm` keybindings. + +## Integration with vim + +There are two great plugins [tmux-navigate][10] and [vim-tmux-navigator][3], +which both allow seamless navigation between `vim` splits and `tmux` splits. +The former has an advantage that it also works over `ssh` connections, and that +it plays better with zooming (Alt+z). If you use either +plugin, you can tell `tilish` to make it setup the keybindings for you. (If you +don't, `tilish` will use fallback keybindings that don't integrate with `vim`.) + +### Navigate + +It is perhaps easiest to setup `tmux-navigate`. Just load `navigate` *after* `tilish` +in your `tmux.conf`, and set the option `@tilish-navigate` to `on` to integrate them. +Thus a full working minimal example of a `tpm`-based `tmux.conf` would be: + + # List of plugins. + set -g @plugin 'tmux-plugins/tpm' + set -g @plugin 'tmux-plugins/tmux-sensible' + set -g @plugin 'jabirali/tmux-tilish' + set -g @plugin 'sunaku/tmux-navigate' + + # Plugin options. + set -g @tilish-navigate 'on' + + # Install `tpm` if needed. + if "test ! -d ~/.tmux/plugins/tpm" \ + "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'" + + # Activate the plugins. + run -b "~/.tmux/plugins/tpm/tpm" + + +No further setup is required; `tilish` sets up the keybindings, and `navigate` +handles seamless navigation of `vim`/`nvim` splits. However, if you also want +this seamless navigation over `ssh` connections, you should install +the accompanying `vim` plugin; see [their website for more information][10]. + +### Navigator + +To install `vim-tmux-navigator`, you should first install the plugin for `vim` +or `nvim`, as described on [their website][3]. Then place this in your +`~/.config/nvim/init.vim` (`nvim`) or `~/.vimrc` (`vim`): + + noremap :TmuxNavigateLeft + noremap :TmuxNavigateDown + noremap :TmuxNavigateUp + noremap :TmuxNavigateRight + +You then just have to tell `tilish` that you want the integration: + + set -g @tilish-navigator 'on' + +A minimal working example of a `~/.tmux.conf` with `tpm` would then be: + + # List of plugins. + set -g @plugin 'tmux-plugins/tpm' + set -g @plugin 'tmux-plugins/tmux-sensible' + set -g @plugin 'jabirali/tmux-tilish' + + # Plugin options. + set -g @tilish-navigator 'on' + + # Install `tpm` if needed. + if "test ! -d ~/.tmux/plugins/tpm" \ + "run 'git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm && ~/.tmux/plugins/tpm/bin/install_plugins'" + + # Activate the plugins. + run -b "~/.tmux/plugins/tpm/tpm" + +[3]: https://github.com/christoomey/vim-tmux-navigator +[10]: https://github.com/sunaku/tmux-navigate + +# Related projects + +- [3mux](https://github.com/aaronjanse/3mux) +- [tmux-navigate](https://github.com/sunaku/tmux-navigate) +- [vim-tmux-navigator](https://github.com/christoomey/vim-tmux-navigator) +- [vim-i3wm-tmux-navigator](https://github.com/fogine/vim-i3wm-tmux-navigator) diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/HEAD b/dot_config/tmux/plugins/tmux-tilish/dot_git/HEAD new file mode 100644 index 0000000..cb089cd --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/HEAD @@ -0,0 +1 @@ +ref: refs/heads/master diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/branches/.keep b/dot_config/tmux/plugins/tmux-tilish/dot_git/branches/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/config b/dot_config/tmux/plugins/tmux-tilish/dot_git/config new file mode 100644 index 0000000..5b9f532 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/config @@ -0,0 +1,13 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[submodule] + active = . +[remote "origin"] + url = https://git::@github.com/jabirali/tmux-tilish + fetch = +refs/heads/master:refs/remotes/origin/master +[branch "master"] + remote = origin + merge = refs/heads/master diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/description b/dot_config/tmux/plugins/tmux-tilish/dot_git/description new file mode 100644 index 0000000..498b267 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/description @@ -0,0 +1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_applypatch-msg.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_applypatch-msg.sample new file mode 100644 index 0000000..a5d7b84 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_applypatch-msg.sample @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +commitmsg="$(git rev-parse --git-path hooks/commit-msg)" +test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +: diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_commit-msg.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_commit-msg.sample new file mode 100644 index 0000000..b58d118 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_commit-msg.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_fsmonitor-watchman.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_fsmonitor-watchman.sample new file mode 100644 index 0000000..23e856f --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_fsmonitor-watchman.sample @@ -0,0 +1,174 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use IPC::Open2; + +# An example hook script to integrate Watchman +# (https://facebook.github.io/watchman/) with git to speed up detecting +# new and modified files. +# +# The hook is passed a version (currently 2) and last update token +# formatted as a string and outputs to stdout a new update token and +# all files that have been modified since the update token. Paths must +# be relative to the root of the working tree and separated by a single NUL. +# +# To enable this hook, rename this file to "query-watchman" and set +# 'git config core.fsmonitor .git/hooks/query-watchman' +# +my ($version, $last_update_token) = @ARGV; + +# Uncomment for debugging +# print STDERR "$0 $version $last_update_token\n"; + +# Check the hook interface version +if ($version ne 2) { + die "Unsupported query-fsmonitor hook version '$version'.\n" . + "Falling back to scanning...\n"; +} + +my $git_work_tree = get_working_dir(); + +my $retry = 1; + +my $json_pkg; +eval { + require JSON::XS; + $json_pkg = "JSON::XS"; + 1; +} or do { + require JSON::PP; + $json_pkg = "JSON::PP"; +}; + +launch_watchman(); + +sub launch_watchman { + my $o = watchman_query(); + if (is_work_tree_watched($o)) { + output_result($o->{clock}, @{$o->{files}}); + } +} + +sub output_result { + my ($clockid, @files) = @_; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # binmode $fh, ":utf8"; + # print $fh "$clockid\n@files\n"; + # close $fh; + + binmode STDOUT, ":utf8"; + print $clockid; + print "\0"; + local $, = "\0"; + print @files; +} + +sub watchman_clock { + my $response = qx/watchman clock "$git_work_tree"/; + die "Failed to get clock id on '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + + return $json_pkg->new->utf8->decode($response); +} + +sub watchman_query { + my $pid = open2(\*CHLD_OUT, \*CHLD_IN, 'watchman -j --no-pretty') + or die "open2() failed: $!\n" . + "Falling back to scanning...\n"; + + # In the query expression below we're asking for names of files that + # changed since $last_update_token but not from the .git folder. + # + # To accomplish this, we're using the "since" generator to use the + # recency index to select candidate nodes and "fields" to limit the + # output to file names only. Then we're using the "expression" term to + # further constrain the results. + my $last_update_line = ""; + if (substr($last_update_token, 0, 1) eq "c") { + $last_update_token = "\"$last_update_token\""; + $last_update_line = qq[\n"since": $last_update_token,]; + } + my $query = <<" END"; + ["query", "$git_work_tree", {$last_update_line + "fields": ["name"], + "expression": ["not", ["dirname", ".git"]] + }] + END + + # Uncomment for debugging the watchman query + # open (my $fh, ">", ".git/watchman-query.json"); + # print $fh $query; + # close $fh; + + print CHLD_IN $query; + close CHLD_IN; + my $response = do {local $/; }; + + # Uncomment for debugging the watch response + # open ($fh, ">", ".git/watchman-response.json"); + # print $fh $response; + # close $fh; + + die "Watchman: command returned no output.\n" . + "Falling back to scanning...\n" if $response eq ""; + die "Watchman: command returned invalid output: $response\n" . + "Falling back to scanning...\n" unless $response =~ /^\{/; + + return $json_pkg->new->utf8->decode($response); +} + +sub is_work_tree_watched { + my ($output) = @_; + my $error = $output->{error}; + if ($retry > 0 and $error and $error =~ m/unable to resolve root .* directory (.*) is not watched/) { + $retry--; + my $response = qx/watchman watch "$git_work_tree"/; + die "Failed to make watchman watch '$git_work_tree'.\n" . + "Falling back to scanning...\n" if $? != 0; + $output = $json_pkg->new->utf8->decode($response); + $error = $output->{error}; + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + # Uncomment for debugging watchman output + # open (my $fh, ">", ".git/watchman-output.out"); + # close $fh; + + # Watchman will always return all files on the first query so + # return the fast "everything is dirty" flag to git and do the + # Watchman query just to get it over with now so we won't pay + # the cost in git to look up each individual file. + my $o = watchman_clock(); + $error = $output->{error}; + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + output_result($o->{clock}, ("/")); + $last_update_token = $o->{clock}; + + eval { launch_watchman() }; + return 0; + } + + die "Watchman: $error.\n" . + "Falling back to scanning...\n" if $error; + + return 1; +} + +sub get_working_dir { + my $working_dir; + if ($^O =~ 'msys' || $^O =~ 'cygwin') { + $working_dir = Win32::GetCwd(); + $working_dir =~ tr/\\/\//; + } else { + require Cwd; + $working_dir = Cwd::cwd(); + } + + return $working_dir; +} diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_post-update.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_post-update.sample new file mode 100644 index 0000000..ec17ec1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_post-update.sample @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-applypatch.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-applypatch.sample new file mode 100644 index 0000000..4142082 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-applypatch.sample @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +precommit="$(git rev-parse --git-path hooks/pre-commit)" +test -x "$precommit" && exec "$precommit" ${1+"$@"} +: diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-commit.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-commit.sample new file mode 100644 index 0000000..29ed5ee --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-commit.sample @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=$(git hash-object -t tree /dev/null) +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --type=bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff-index --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-merge-commit.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-merge-commit.sample new file mode 100644 index 0000000..399eab1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-merge-commit.sample @@ -0,0 +1,13 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git merge" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message to +# stderr if it wants to stop the merge commit. +# +# To enable this hook, rename this file to "pre-merge-commit". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" +: diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-push.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-push.sample new file mode 100644 index 0000000..4ce688d --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-push.sample @@ -0,0 +1,53 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +zero=$(git hash-object --stdin &2 "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-rebase.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-rebase.sample new file mode 100644 index 0000000..6cbef5c --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-rebase.sample @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up to date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-receive.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-receive.sample new file mode 100644 index 0000000..a1fd29e --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_pre-receive.sample @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to make use of push options. +# The example simply echoes all push options that start with 'echoback=' +# and rejects all pushes when the "reject" push option is used. +# +# To enable this hook, rename this file to "pre-receive". + +if test -n "$GIT_PUSH_OPTION_COUNT" +then + i=0 + while test "$i" -lt "$GIT_PUSH_OPTION_COUNT" + do + eval "value=\$GIT_PUSH_OPTION_$i" + case "$value" in + echoback=*) + echo "echo from the pre-receive-hook: ${value#*=}" >&2 + ;; + reject) + exit 1 + esac + i=$((i + 1)) + done +fi diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_prepare-commit-msg.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_prepare-commit-msg.sample new file mode 100644 index 0000000..10fa14c --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_prepare-commit-msg.sample @@ -0,0 +1,42 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first one removes the +# "# Please enter the commit message..." help message. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +COMMIT_MSG_FILE=$1 +COMMIT_SOURCE=$2 +SHA1=$3 + +/usr/bin/perl -i.bak -ne 'print unless(m/^. Please enter the commit message/..m/^#$/)' "$COMMIT_MSG_FILE" + +# case "$COMMIT_SOURCE,$SHA1" in +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$COMMIT_MSG_FILE" ;; +# *) ;; +# esac + +# SOB=$(git var GIT_COMMITTER_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# git interpret-trailers --in-place --trailer "$SOB" "$COMMIT_MSG_FILE" +# if test -z "$COMMIT_SOURCE" +# then +# /usr/bin/perl -i.bak -pe 'print "\n" if !$first_line++' "$COMMIT_MSG_FILE" +# fi diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_push-to-checkout.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_push-to-checkout.sample new file mode 100644 index 0000000..af5a0c0 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_push-to-checkout.sample @@ -0,0 +1,78 @@ +#!/bin/sh + +# An example hook script to update a checked-out tree on a git push. +# +# This hook is invoked by git-receive-pack(1) when it reacts to git +# push and updates reference(s) in its repository, and when the push +# tries to update the branch that is currently checked out and the +# receive.denyCurrentBranch configuration variable is set to +# updateInstead. +# +# By default, such a push is refused if the working tree and the index +# of the remote repository has any difference from the currently +# checked out commit; when both the working tree and the index match +# the current commit, they are updated to match the newly pushed tip +# of the branch. This hook is to be used to override the default +# behaviour; however the code below reimplements the default behaviour +# as a starting point for convenient modification. +# +# The hook receives the commit with which the tip of the current +# branch is going to be updated: +commit=$1 + +# It can exit with a non-zero status to refuse the push (when it does +# so, it must not modify the index or the working tree). +die () { + echo >&2 "$*" + exit 1 +} + +# Or it can make any necessary changes to the working tree and to the +# index to bring them to the desired state when the tip of the current +# branch is updated to the new commit, and exit with a zero status. +# +# For example, the hook can simply run git read-tree -u -m HEAD "$1" +# in order to emulate git fetch that is run in the reverse direction +# with git push, as the two-tree form of git read-tree -u -m is +# essentially the same as git switch or git checkout that switches +# branches while keeping the local changes in the working tree that do +# not interfere with the difference between the branches. + +# The below is a more-or-less exact translation to shell of the C code +# for the default behaviour for git's push-to-checkout hook defined in +# the push_to_deploy() function in builtin/receive-pack.c. +# +# Note that the hook will be executed from the repository directory, +# not from the working tree, so if you want to perform operations on +# the working tree, you will have to adapt your code accordingly, e.g. +# by adding "cd .." or using relative paths. + +if ! git update-index -q --ignore-submodules --refresh +then + die "Up-to-date check failed" +fi + +if ! git diff-files --quiet --ignore-submodules -- +then + die "Working directory has unstaged changes" +fi + +# This is a rough translation of: +# +# head_has_history() ? "HEAD" : EMPTY_TREE_SHA1_HEX +if git cat-file -e HEAD 2>/dev/null +then + head=HEAD +else + head=$(git hash-object -t tree --stdin &2 + exit 1 +} + +unset GIT_DIR GIT_WORK_TREE +cd "$worktree" && + +if grep -q "^diff --git " "$1" +then + validate_patch "$1" +else + validate_cover_letter "$1" +fi && + +if test "$GIT_SENDEMAIL_FILE_COUNTER" = "$GIT_SENDEMAIL_FILE_TOTAL" +then + git config --unset-all sendemail.validateWorktree && + trap 'git worktree remove -ff "$worktree"' EXIT && + validate_series +fi diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_update.sample b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_update.sample new file mode 100644 index 0000000..c4d426b --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/hooks/executable_update.sample @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to block unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --type=bool hooks.allowunannotated) +allowdeletebranch=$(git config --type=bool hooks.allowdeletebranch) +denycreatebranch=$(git config --type=bool hooks.denycreatebranch) +allowdeletetag=$(git config --type=bool hooks.allowdeletetag) +allowmodifytag=$(git config --type=bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero=$(git hash-object --stdin &2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/index b/dot_config/tmux/plugins/tmux-tilish/dot_git/index new file mode 100644 index 0000000..d374738 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-tilish/dot_git/index differ diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/info/exclude b/dot_config/tmux/plugins/tmux-tilish/dot_git/info/exclude new file mode 100644 index 0000000..a5196d1 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/info/exclude @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/HEAD b/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/HEAD new file mode 100644 index 0000000..e8fd9df --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6abf7be089804a1d19a5737c8f9f7cb5bb519fc3 Hydroxycarbamide 1727090004 +0200 clone: from https://github.com/jabirali/tmux-tilish diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/refs/heads/master b/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/refs/heads/master new file mode 100644 index 0000000..e8fd9df --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/refs/heads/master @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6abf7be089804a1d19a5737c8f9f7cb5bb519fc3 Hydroxycarbamide 1727090004 +0200 clone: from https://github.com/jabirali/tmux-tilish diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/refs/remotes/origin/HEAD b/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/refs/remotes/origin/HEAD new file mode 100644 index 0000000..e8fd9df --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/logs/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +0000000000000000000000000000000000000000 6abf7be089804a1d19a5737c8f9f7cb5bb519fc3 Hydroxycarbamide 1727090004 +0200 clone: from https://github.com/jabirali/tmux-tilish diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/info/.keep b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/info/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.idx b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.idx new file mode 100644 index 0000000..d1de464 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.idx differ diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.pack b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.pack new file mode 100644 index 0000000..ee48b07 Binary files /dev/null and b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.pack differ diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.rev b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.rev new file mode 100644 index 0000000..dcdd31e Binary files /dev/null and b/dot_config/tmux/plugins/tmux-tilish/dot_git/objects/pack/readonly_pack-065e83563d291f0d2f14eb0476297fbe3cdcf7e4.rev differ diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/packed-refs b/dot_config/tmux/plugins/tmux-tilish/dot_git/packed-refs new file mode 100644 index 0000000..64fcf55 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/packed-refs @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled sorted +6abf7be089804a1d19a5737c8f9f7cb5bb519fc3 refs/remotes/origin/master diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/heads/master b/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/heads/master new file mode 100644 index 0000000..e8bbe39 --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/heads/master @@ -0,0 +1 @@ +6abf7be089804a1d19a5737c8f9f7cb5bb519fc3 diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/remotes/origin/HEAD b/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/remotes/origin/HEAD new file mode 100644 index 0000000..6efe28f --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/remotes/origin/HEAD @@ -0,0 +1 @@ +ref: refs/remotes/origin/master diff --git a/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/tags/.keep b/dot_config/tmux/plugins/tmux-tilish/dot_git/refs/tags/.keep new file mode 100644 index 0000000..e69de29 diff --git a/dot_config/tmux/plugins/tmux-tilish/executable_tilish.tmux b/dot_config/tmux/plugins/tmux-tilish/executable_tilish.tmux new file mode 100644 index 0000000..c41dbab --- /dev/null +++ b/dot_config/tmux/plugins/tmux-tilish/executable_tilish.tmux @@ -0,0 +1,294 @@ +#!/bin/sh +# vim: foldmethod=marker + +# Project: tmux-tilish +# Author: Jabir Ali Ouassou +# Licence: MIT licence +# +# This file contains the `tmux` plugin `tilish`, which implements keybindings +# that turns `tmux` into a more typical tiling window manger for your terminal. +# The keybindings are taken nearly directly from `i3wm` and `sway`, but with +# minor adaptation to fit better with `vim` and `tmux`. See also the README. + +# shellcheck disable=SC2016 +# shellcheck disable=SC2086 +# shellcheck disable=SC2250 + +# Check input parameters {{{ + # Whether we need to use legacy workarounds (required before Tmux 2.7). + legacy="$(tmux -V | grep -E 'tmux (1\.|2\.[0-6])')" + + # Read user options. + for opt in default dmenu easymode navigate navigator prefix shiftnum + do + export "$opt"="$(tmux show-option -gv @tilish-"$opt" 2>/dev/null)" + done + + # Default to US keyboard layout, unless something is configured. + if [ -z "$shiftnum" ] + then + shiftnum='!@#$%^&*()' + fi + + # Determine "arrow types". + if [ "${easymode:-}" = "on" ] + then + # Simplified arrows. + h='left'; j='down'; k='up'; l='right'; + H='S-left'; J='S-down'; K='S-up'; L='S-right'; + else + # Vim-style arrows. + h='h'; j='j'; k='k'; l='l'; + H='H'; J='J'; K='K'; L='L'; + fi + + # Determine modifier vs. prefix key. + if [ -z "${prefix:-}" ] + then + bind='bind -n' + mod='M-' + else + bind='bind -rT tilish' + mod='' + fi +# }}} + +# Define core functionality {{{ +bind_switch () { + # Bind keys to switch between workspaces. + tmux $bind "$1" \ + if-shell "tmux select-window -t :$2" "" "new-window -t :$2" +} + +bind_move () { + # Bind keys to move panes between workspaces. + if [ -z "$legacy" ] + then + tmux $bind "$1" \ + if-shell "tmux join-pane -t :$2" \ + "" \ + "new-window -dt :$2; join-pane -t :$2; select-pane -t top-left; kill-pane" \\\;\ + select-layout \\\;\ + select-layout -E + else + tmux $bind "$1" \ + if-shell "tmux new-window -dt :$2" \ + "join-pane -t :$2; select-pane -t top-left; kill-pane" \ + "send escape; join-pane -t :$2" \\\;\ + select-layout + fi +} + +bind_layout () { + # Bind keys to switch or refresh layouts. + if [ "$2" = "zoom" ] + then + # Invoke the zoom feature. + tmux $bind "$1" \ + resize-pane -Z + else + # Actually switch layout. + if [ -z "$legacy" ] + then + tmux $bind "$1" \ + select-layout "$2" \\\;\ + select-layout -E + else + tmux $bind "$1" \ + run-shell "tmux select-layout \"$2\"" \\\;\ + send escape + fi + fi +} + +char_at () { + # Finding the character at a given position in + # a string in a way compatible with POSIX sh. + echo $1 | cut -c $2 +} +# }}} + +# Define keybindings {{{ +# Define a prefix key. +if [ -n "$prefix" ] +then + tmux bind -n "$prefix" switch-client -T tilish +fi + +# Switch to workspace via Alt + #. +bind_switch "${mod}1" 1 +bind_switch "${mod}2" 2 +bind_switch "${mod}3" 3 +bind_switch "${mod}4" 4 +bind_switch "${mod}5" 5 +bind_switch "${mod}6" 6 +bind_switch "${mod}7" 7 +bind_switch "${mod}8" 8 +bind_switch "${mod}9" 9 + +# Move pane to workspace via Alt + Shift + #. +bind_move "${mod}$(char_at $shiftnum 1)" 1 +bind_move "${mod}$(char_at $shiftnum 2)" 2 +bind_move "${mod}$(char_at $shiftnum 3)" 3 +bind_move "${mod}$(char_at $shiftnum 4)" 4 +bind_move "${mod}$(char_at $shiftnum 5)" 5 +bind_move "${mod}$(char_at $shiftnum 6)" 6 +bind_move "${mod}$(char_at $shiftnum 7)" 7 +bind_move "${mod}$(char_at $shiftnum 8)" 8 +bind_move "${mod}$(char_at $shiftnum 9)" 9 + +# The mapping of Alt + 0 and Alt + Shift + 0 depends on `base-index`. +# It can either refer to workspace number 0 or workspace number 10. +if [ "$(tmux show-option -gv base-index)" = "1" ] +then + bind_switch "${mod}0" 10 + bind_move "${mod}$(char_at "$shiftnum" 10)" 10 +else + bind_switch "${mod}0" 0 + bind_move "${mod}$(char_at "$shiftnum" 10)" 0 +fi + +# Switch layout with Alt + . The mnemonics are `s` and `S` for +# layouts Vim would generate with `:split`, and `v` and `V` for `:vsplit`. +# The remaining mappings based on `z` and `t` should be quite obvious. +bind_layout "${mod}s" 'main-horizontal' +bind_layout "${mod}S" 'even-vertical' +bind_layout "${mod}v" 'main-vertical' +bind_layout "${mod}V" 'even-horizontal' +bind_layout "${mod}t" 'tiled' +bind_layout "${mod}z" 'zoom' + +# Refresh the current layout (e.g. after deleting a pane). +if [ -z "$legacy" ] +then + tmux $bind "${mod}r" select-layout -E +else + tmux $bind "${mod}r" run-shell 'tmux select-layout'\\\; send escape +fi + +# Switch pane via Alt + o. (Mirrors Tmux `Ctrl-b o` and Emacs `Ctrl-x o`.) +tmux $bind "${mod}o" select-pane -t :.+1 + +# Switch to pane via Alt + hjkl. +tmux $bind "${mod}${h}" select-pane -L +tmux $bind "${mod}${j}" select-pane -D +tmux $bind "${mod}${k}" select-pane -U +tmux $bind "${mod}${l}" select-pane -R + +# Move a pane via Alt + Shift + hjkl. +if [ -z "$legacy" ] +then + tmux $bind "${mod}${H}" swap-pane -s '{left-of}' + tmux $bind "${mod}${J}" swap-pane -s '{down-of}' + tmux $bind "${mod}${K}" swap-pane -s '{up-of}' + tmux $bind "${mod}${L}" swap-pane -s '{right-of}' +else + tmux $bind "${mod}${H}" run-shell 'old=`tmux display -p "#{pane_index}"`; tmux select-pane -L; tmux swap-pane -t $old' + tmux $bind "${mod}${J}" run-shell 'old=`tmux display -p "#{pane_index}"`; tmux select-pane -D; tmux swap-pane -t $old' + tmux $bind "${mod}${K}" run-shell 'old=`tmux display -p "#{pane_index}"`; tmux select-pane -U; tmux swap-pane -t $old' + tmux $bind "${mod}${L}" run-shell 'old=`tmux display -p "#{pane_index}"`; tmux select-pane -R; tmux swap-pane -t $old' +fi + +# Open a terminal with Alt + Enter. +if [ -z "$legacy" ] +then + tmux $bind "${mod}enter" \ + run-shell 'cwd="`tmux display -p \"#{pane_current_path}\"`"; tmux select-pane -t "bottom-right"; tmux split-pane -c "$cwd"' +else + tmux $bind "${mod}enter" \ + select-pane -t 'bottom-right' \\\;\ + split-window \\\;\ + run-shell 'tmux select-layout' \\\;\ + send escape +fi + +# Name a window with Alt + n. +tmux $bind "${mod}n" \ + command-prompt -p 'Workspace name:' 'rename-window "%%"' + +# Close a window with Alt + Shift + q. +if [ -z "$legacy" ] +then + tmux $bind "${mod}Q" \ + if-shell \ + '[ "$(tmux display-message -p "#{window_panes}")" -gt 1 ]' \ + 'kill-pane; select-layout; select-layout -E' \ + 'kill-pane' +else + tmux $bind "${mod}Q" \ + kill-pane +fi + +# Close a connection with Alt + Shift + e. +tmux $bind "${mod}E" \ + confirm-before -p "Detach from #H:#S? (y/n)" detach-client + +# Reload configuration with Alt + Shift + c. +tmux $bind "${mod}C" \ + source-file ~/.tmux.conf \\\;\ + display "Reloaded config" +# }}} + +# Define hooks {{{ +if [ -z "$legacy" ] +then + # Autorefresh layout after deleting a pane. + tmux set-hook -g after-split-window "select-layout; select-layout -E" + tmux set-hook -g pane-exited "select-layout; select-layout -E" + + # Autoselect layout after creating new window. + if [ -n "${default:-}" ] + then + tmux set-hook -g window-linked "select-layout \"$default\"; select-layout -E" + tmux select-layout "$default" + tmux select-layout -E + fi +fi +# }}} + +# Integrate with Vim for transparent navigation {{{ +if [ "${navigate:-}" = "on" ] +then + # If `@tilish-navigate` is nonzero, integrate Alt + hjkl with `tmux-navigate`. + tmux set -g '@navigate-left' "-n M-$h" + tmux set -g '@navigate-down' "-n M-$j" + tmux set -g '@navigate-up' "-n M-$k" + tmux set -g '@navigate-right' "-n M-$l" +elif [ "${navigator:-}" = "on" ] +then + # If `@tilish-navigator` is nonzero, integrate Alt + hjkl with `vim-tmux-navigator`. + # This assumes that your Vim/Neovim is setup to use Alt + hjkl bindings as well. + is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" + + tmux $bind "${mod}${h}" if-shell "$is_vim" 'send M-h' 'select-pane -L' + tmux $bind "${mod}${j}" if-shell "$is_vim" 'send M-j' 'select-pane -D' + tmux $bind "${mod}${k}" if-shell "$is_vim" 'send M-k' 'select-pane -U' + tmux $bind "${mod}${l}" if-shell "$is_vim" 'send M-l' 'select-pane -R' + + if [ -z "$prefix" ] + then + tmux bind -T copy-mode-vi "M-$h" select-pane -L + tmux bind -T copy-mode-vi "M-$j" select-pane -D + tmux bind -T copy-mode-vi "M-$k" select-pane -U + tmux bind -T copy-mode-vi "M-$l" select-pane -R + fi +fi +# }}} + +# Integrate with `fzf` to approximate `dmenu` {{{ +if [ -z "$legacy" ] && [ "${dmenu:-}" = "on" ] +then + if [ -n "$(command -v fzf)" ] + then + # The environment variables of your `default-shell` are used when running `fzf`. + # This solution is about an order of magnitude faster than invoking `compgen`. + # Based on: https://medium.com/njiuko/using-fzf-instead-of-dmenu-2780d184753f + tmux $bind "${mod}d" \ + select-pane -t '{bottom-right}' \\\;\ + split-pane 'sh -c "exec \$(echo \"\$PATH\" | tr \":\" \"\n\" | xargs -I{} -- find {} -maxdepth 1 -mindepth 1 -executable 2>/dev/null | sort -u | fzf)"' + else + tmux $bind "${mod}d" \ + display 'To enable this function, install `fzf` and restart `tmux`.' + fi +fi +# }}} diff --git a/dot_config/tmux/plugins/tpm/dot_git/FETCH_HEAD b/dot_config/tmux/plugins/tpm/dot_git/FETCH_HEAD new file mode 100644 index 0000000..c463c9b --- /dev/null +++ b/dot_config/tmux/plugins/tpm/dot_git/FETCH_HEAD @@ -0,0 +1 @@ +99469c4a9b1ccf77fade25842dc7bafbc8ce9946 branch 'master' of https://github.com/tmux-plugins/tpm diff --git a/dot_config/tmux/plugins/tpm/dot_git/ORIG_HEAD b/dot_config/tmux/plugins/tpm/dot_git/ORIG_HEAD new file mode 100644 index 0000000..e69d6dc --- /dev/null +++ b/dot_config/tmux/plugins/tpm/dot_git/ORIG_HEAD @@ -0,0 +1 @@ +99469c4a9b1ccf77fade25842dc7bafbc8ce9946 diff --git a/dot_config/tmux/tmux.conf b/dot_config/tmux/tmux.conf index bed90fd..2f4bb97 100644 --- a/dot_config/tmux/tmux.conf +++ b/dot_config/tmux/tmux.conf @@ -1,5 +1,7 @@ -set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.local/share/tmux/plugins' +set-environment -g TMUX_PLUGIN_MANAGER_PATH '~/.config/tmux/plugins' +# personal +set -g mouse on set -g base-index 1 setw -g pane-base-index 1 set -g default-terminal "xterm-256color" @@ -20,4 +22,4 @@ set -g @tilish-default 'main-vertical' set -g @tilish-navigate 'on' set -g @catppuccin_flavor 'macchiato' -run '~/.local/share/tmux/plugins/tpm/tpm' +run '~/.config/tmux/plugins/tpm/tpm'