ficd/dotfiles
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

AutoYADM commit: 2025-07-04 16:06:01

Browse source
This commit is contained in:
Daniel Fichtinger 2025-07-04 16:06:01 -04:00
parent b292153f3e
commit decc82c4c1
2 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
.config/fish/completions/zona.fish Normal file
View file

@ -0,0 +1 @@
complete --command zona --no-files --arguments "(env _ZONA_COMPLETE=complete_fish _TYPER_COMPLETE_FISH_ACTION=get-args _TYPER_COMPLETE_ARGS=(commandline -cp) zona)" --condition "env _ZONA_COMPLETE=complete_fish _TYPER_COMPLETE_FISH_ACTION=is-args _TYPER_COMPLETE_ARGS=(commandline -cp) zona"

17
.config/fish/conf.d/bin/git-forgit
View file

@ -755,32 +755,34 @@ _forgit_file_preview() {
_forgit_fixup() { _forgit_fixup() {
_forgit_inside_work_tree || return 1 _forgit_inside_work_tree || return 1
git diff --cached --quiet && echo 'Nothing to fixup: there are no staged changes.' && return 1 git diff --cached --quiet && echo 'Nothing to fixup: there are no staged changes.' && return 1
_forgit_edit_commit --fixup "$FORGIT_FIXUP_FZF_OPTS" "$FORGIT_FIXUP_GIT_OPTS" _forgit_edit_commit --fixup "$FORGIT_FIXUP_FZF_OPTS" "$FORGIT_FIXUP_GIT_OPTS" "$@"
} }
_forgit_squash() { _forgit_squash() {
_forgit_inside_work_tree || return 1 _forgit_inside_work_tree || return 1
git diff --cached --quiet && echo 'Nothing to squash: there are no staged changes.' && return 1 git diff --cached --quiet && echo 'Nothing to squash: there are no staged changes.' && return 1
_forgit_edit_commit --squash "$FORGIT_SQUASH_FZF_OPTS" "$FORGIT_SQUASH_GIT_OPTS" _forgit_edit_commit --squash "$FORGIT_SQUASH_FZF_OPTS" "$FORGIT_SQUASH_GIT_OPTS" "$@"
} }
_forgit_edit_commit() { _forgit_edit_commit() {
local action fzf_opts opts graph target_commit prev_commit local action fzf_opts opts graph quoted_files target_commit prev_commit
action=$1 action=$1
fzf_opts=$2 fzf_opts=$2
graph=() graph=()
[[ $_forgit_log_graph_enable == true ]] && graph=(--graph) [[ $_forgit_log_graph_enable == true ]] && graph=(--graph)
git_opts=() git_opts=()
_forgit_parse_array git_opts "$3" _forgit_parse_array git_opts "$3"
shift 3
quoted_files=$(_forgit_quote_files "$@")
opts=" opts="
$FORGIT_FZF_DEFAULT_OPTS $FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index +s +m --tiebreak=index
--bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\" --bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\"
--preview=\"$FORGIT file_preview {}\" --preview=\"$FORGIT file_preview {} $quoted_files\"
$fzf_opts $fzf_opts
" "
target_commit=$( target_commit=$(
git log "${graph[@]}" --color=always --format="$_forgit_log_format" | git log "${graph[@]}" --color=always --format="$_forgit_log_format" "$@" |
_forgit_emojify | _forgit_emojify |
FZF_DEFAULT_OPTS="$opts" fzf | FZF_DEFAULT_OPTS="$opts" fzf |
_forgit_extract_sha) _forgit_extract_sha)
@ -800,15 +802,16 @@ _forgit_reword() {
[[ $_forgit_log_graph_enable == true ]] && graph=(--graph) [[ $_forgit_log_graph_enable == true ]] && graph=(--graph)
git_opts=() git_opts=()
_forgit_parse_array _forgit_reword_git_opts "$FORGIT_REWORD_GIT_OPTS" _forgit_parse_array _forgit_reword_git_opts "$FORGIT_REWORD_GIT_OPTS"
quoted_files=$(_forgit_quote_files "$@")
opts=" opts="
$FORGIT_FZF_DEFAULT_OPTS $FORGIT_FZF_DEFAULT_OPTS
+s +m --tiebreak=index +s +m --tiebreak=index
--bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\" --bind=\"ctrl-y:execute-silent($FORGIT yank_sha {})\"
--preview=\"$FORGIT file_preview {}\" --preview=\"$FORGIT file_preview {} $quoted_files\"
$FORGIT_REWORD_FZF_OPTS $FORGIT_REWORD_FZF_OPTS
" "
target_commit=$( target_commit=$(
git log "${graph[@]}" --color=always --format="$_forgit_log_format" | git log "${graph[@]}" --color=always --format="$_forgit_log_format" "$@" |
_forgit_emojify | _forgit_emojify |
FZF_DEFAULT_OPTS="$opts" fzf | FZF_DEFAULT_OPTS="$opts" fzf |
_forgit_extract_sha) _forgit_extract_sha)