diff --git a/.gitconfig b/.gitconfig index 21621e7..5af73a6 100644 --- a/.gitconfig +++ b/.gitconfig @@ -11,7 +11,6 @@ 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 deleted file mode 100755 index ea3a864..0000000 --- a/.local/bin/git-tmp-switch.sh +++ /dev/null @@ -1,31 +0,0 @@ -#!/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 diff --git a/.local/bin/tmux-sessionizer b/.local/bin/tmux-sessionizer deleted file mode 100755 index aa70e71..0000000 --- a/.local/bin/tmux-sessionizer +++ /dev/null @@ -1,29 +0,0 @@ -#!/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 332cc7a..2e41fd7 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -13,7 +13,6 @@ 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 71e2358..5b2cfc4 100644 --- a/.zshrc +++ b/.zshrc @@ -47,8 +47,6 @@ 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