···22# Kanagawa Paper
33# Ported from https://github.com/sho-87/kanagawa-paper.nvim
4455-[colors]
55+[colors-dark]
66background=1F1F28
77foreground=DCD7BA
88cursor=1F1F28 c8c093
+39
zsh/.dotfiles/zsh/aliases.shrc
···8282alias gcl='git clone'
8383alias gt='vim -c ":DiffviewOpen"' --diff current changes
8484# alias gtb = '! args=$@; shift $#; nvim -c \"DiffviewOpen $args\"'
8585+#
8686+# Start: Omarchy
8787+# Create a new worktree and branch from within current git directory.
8888+gw() {
8989+ if [[ -z "$1" ]]; then
9090+ echo "Usage: ga [branch name]"
9191+ return 1
9292+ fi
9393+9494+ local branch="$1"
9595+ local base="$(basename "$PWD")"
9696+ local wt_path="../${base}--${branch}"
9797+9898+ git worktree add -b "$branch" "$wt_path"
9999+ mise trust "$wt_path"
100100+ cd "$wt_path"
101101+}
102102+103103+# Remove worktree and branch from within active worktree directory.
104104+gwd() {
105105+ if gum confirm "Remove worktree and branch?"; then
106106+ local cwd base branch root worktree
107107+108108+ cwd="$(pwd)"
109109+ worktree="$(basename "$cwd")"
110110+111111+ # split on first `--`
112112+ root="${worktree%%--*}"
113113+ branch="${worktree#*--}"
114114+115115+ # Protect against accidentally nuking a non-worktree directory
116116+ if [[ "$root" != "$worktree" ]]; then
117117+ cd "../$root"
118118+ git worktree remove "$cwd" --force || return 1
119119+ git branch -D "$branch"
120120+ fi
121121+ fi
122122+}
123123+# End: Omarchy
8512486125#kuberentes
87126alias k=kubectl
+4-1
zsh/.dotfiles/zsh/omarchy.shrc
···1122-source ~/.local/share/omarchy/default/bash/functions
22+# Source omarchy bash functions except worktrees (conflicts with git aliases)
33+for f in ~/.local/share/omarchy/default/bash/fns/*; do
44+ [[ "$(basename "$f")" != "worktrees" ]] && source "$f"
55+done
36# source ~/.local/share/omarchy/default/bash/init