Skip to content

Commit

Permalink
misc improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
jyn514 committed Nov 30, 2024
1 parent f1bbee7 commit 1b8b008
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 2 deletions.
1 change: 1 addition & 0 deletions config/gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
fetch-update = !git fetch upstream && git rebase upstream/HEAD
rdiff = range-diff --check upstream/HEAD @{u} HEAD
update = !git fetch-update && git rdiff && read -p "'push? [y/N] '" REPLY && [ \"$REPLY\" = y ] && git pf
new = !git fetch upstream && git checkout upstream/HEAD && git checkout -b
up = update
a = add
b = branch
Expand Down
2 changes: 1 addition & 1 deletion config/profile
Original file line number Diff line number Diff line change
Expand Up @@ -358,7 +358,7 @@ export BAT_STYLE=changes,header,rule
export GOPATH=~/.local/lib/go
export GOBIN="$GOPATH/bin"
export CARGO_MOMMYS_MOODS=ominous
export FZF_DEFAULT_OPTS='--tmux --cycle --exit-0 --select-1 --preview-window=wrap'
export FZF_DEFAULT_OPTS='--cycle --exit-0 --select-1 --preview-window=wrap'

# git treats `diff.external` extremely poorly; there's no way to unset it temporarily because `-c diff.external` tries to run an empty program.
# instead, set this through an external env variable so we can unset it with `env -u`.
Expand Down
5 changes: 4 additions & 1 deletion config/zshrc
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
#!/usr/bin/env zsh
# docs: https://zsh.sourceforge.io/Doc/Release/index.html#Top
# to see the keymap, `bindkey` (-M for a specific keymap)
# to see all completions, `echo $_comps`. for a specific completion, `which _ls` *usually* works.
# to debug a specific completion, `C-x ? Up`
# to see all functions, `print -l ${(ok)functions}`
# running time on functions: `time (foo)`
# (unfortunately this can't be fixed automatically because `time` takes a whole pipeline as an argument, not a normal list of shell words)

Expand Down Expand Up @@ -173,7 +176,7 @@ zstyle ':completion:*' verbose true

zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*=0=01;31'
zstyle ':completion:*:kill:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
zstyle ':completion:*:gdb:*' command 'ps -A -o pid,tty,cmd'
zstyle ':completion:*:gdb:*' command 'ps --ppid 2 --pid 2 --deselect -o pid,tty,cmd'
zstyle ':completion:*' rehash true

COMPLETION=/usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
Expand Down

0 comments on commit 1b8b008

Please sign in to comment.