From e97fef8036deda13817721dd13970b47d83e21a8 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Tue, 8 Jul 2025 16:41:04 +0200 Subject: [PATCH 1/2] add git cb --- .gitconfig | 1 + .local/bin/git-tmp-switch.sh | 31 +++++++++++++++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100755 .local/bin/git-tmp-switch.sh diff --git a/.gitconfig b/.gitconfig index 5af73a6..21621e7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,6 +11,7 @@ autoSquash = true [alias] publish = !git pull && git push + cb = !git-tmp-switch.sh [push] default = current autoSetupRemote = true diff --git a/.local/bin/git-tmp-switch.sh b/.local/bin/git-tmp-switch.sh new file mode 100755 index 0000000..ea3a864 --- /dev/null +++ b/.local/bin/git-tmp-switch.sh @@ -0,0 +1,31 @@ +#!/bin/bash +set -euo pipefail + +if [ "$#" -lt 1 ]; then + echo "Usage: git cb " + exit 1 +fi + +TARGET_BRANCH="$1" + +if [ "$TARGET_BRANCH" != "-" ]; then + if ! git rev-parse --verify --quiet "$TARGET_BRANCH" >/dev/null; then + echo "Error: branch '$TARGET_BRANCH' does not exist." >&2 + exit 1 + fi +fi + +git add -A +if ! git diff --cached --quiet || [ -n "$(git ls-files --others --exclude-standard)" ]; then + git commit -m "tmp" +fi + +git checkout "$TARGET_BRANCH" + +LATEST_AUTHOR=$(git log -1 --pretty=format:'%an') +LATEST_MESSAGE=$(git log -1 --pretty=format:'%s') +CURRENT_USER=$(git config user.name) +if [ "$LATEST_AUTHOR" = "$CURRENT_USER" ] && [ "$LATEST_MESSAGE" = "tmp" ]; then + echo "Resetting last 'tmp' commit by $CURRENT_USER..." + git reset --mixed HEAD~1 +fi From 24582b2cf912e2b90ba72f3e77743d2862a0c744 Mon Sep 17 00:00:00 2001 From: Sebastian Bugge Date: Mon, 14 Jul 2025 17:16:06 +0200 Subject: [PATCH 2/2] Add tmux-sessionizer. --- .local/bin/tmux-sessionizer | 29 +++++++++++++++++++++++++++++ .tmux.conf | 1 + .zshrc | 2 ++ 3 files changed, 32 insertions(+) create mode 100755 .local/bin/tmux-sessionizer diff --git a/.local/bin/tmux-sessionizer b/.local/bin/tmux-sessionizer new file mode 100755 index 0000000..aa70e71 --- /dev/null +++ b/.local/bin/tmux-sessionizer @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +if [[ $# -eq 1 ]]; then + selected=$1 +else + selected=$(find ~/code -mindepth 1 -maxdepth 1 -type d | fzf) +fi + +if [[ -z $selected ]]; then + exit 0 +fi + +selected_name=$(basename "$selected" | tr . _) +tmux_running=$(pgrep tmux) + +if [[ -z $TMUX ]] && [[ -z $tmux_running ]]; then + tmux new-session -s $selected_name -c $selected + exit 0 +fi + +if ! tmux has-session -t=$selected_name 2>/dev/null; then + tmux new-session -ds $selected_name -c $selected +fi + +if [[ -z $TMUX ]]; then + tmux attach -t $selected_name +else + tmux switch-client -t $selected_name +fi diff --git a/.tmux.conf b/.tmux.conf index 2e41fd7..332cc7a 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -13,6 +13,7 @@ bind | split-window -h bind - split-window -v unbind '"' unbind % +bind-key -r f run-shell "tmux neww ~/.local/bin/tmux-sessionizer" # reload config file (change file location to your the tmux.conf you want to use) bind r source-file ~/.tmux.conf \; display 'Reloaded tmux config!' diff --git a/.zshrc b/.zshrc index 5b2cfc4..71e2358 100644 --- a/.zshrc +++ b/.zshrc @@ -47,6 +47,8 @@ if [ -f $HOME/.local/bin/mise ]; then eval "$($HOME/.local/bin/mise activate zsh)" fi +bindkey -s ^f "tmux-sessionizer\n" + source ~/.aliases fpath+=~/.zfunc autoload -U compinit; compinit -d