Merge branch 'master'
This commit is contained in:
@@ -29,7 +29,7 @@ unbind '%'
|
|||||||
bind-key -n C-x resize-pane -Z
|
bind-key -n C-x resize-pane -Z
|
||||||
bind-key C-x send-keys C-x
|
bind-key C-x send-keys C-x
|
||||||
|
|
||||||
bind k clear-history
|
bind k clear-history\; display "History cleared"
|
||||||
|
|
||||||
bind-key a set-window-option synchronize-panes
|
bind-key a set-window-option synchronize-panes
|
||||||
|
|
||||||
|
|||||||
1722
zsh/.p10k.mac.zsh
Normal file
1722
zsh/.p10k.mac.zsh
Normal file
File diff suppressed because it is too large
Load Diff
@@ -36,6 +36,7 @@ antigen bundle go
|
|||||||
# antigen bundle tmuxinator
|
# antigen bundle tmuxinator
|
||||||
antigen bundle zsh-users/zsh-syntax-highlighting
|
antigen bundle zsh-users/zsh-syntax-highlighting
|
||||||
antigen bundle zsh-users/zsh-autosuggestions
|
antigen bundle zsh-users/zsh-autosuggestions
|
||||||
|
antigen bundle zsh-users/zsh-completions
|
||||||
antigen bundle urbainvaes/fzf-marks
|
antigen bundle urbainvaes/fzf-marks
|
||||||
|
|
||||||
# For SSH, starting ssh-agent is annoying
|
# For SSH, starting ssh-agent is annoying
|
||||||
@@ -82,4 +83,8 @@ export MITMPROXY_SSLKEYLOGFILE="~/.mitmproxy/sslkeylogfile.txt"
|
|||||||
ZLE_RPROMPT_INDENT=0
|
ZLE_RPROMPT_INDENT=0
|
||||||
|
|
||||||
# To customize prompt, run `p10k configure` or edit ~/dotfiles/zsh/.p10k.zsh.
|
# To customize prompt, run `p10k configure` or edit ~/dotfiles/zsh/.p10k.zsh.
|
||||||
[[ ! -f ~/dotfiles/zsh/.p10k.zsh ]] || source ~/dotfiles/zsh/.p10k.zsh
|
if test -f ~/dotfiles/zsh/.p10k.mac.zsh; then
|
||||||
|
source ~/dotfiles/zsh/.p10k.mac.zsh
|
||||||
|
else
|
||||||
|
[[ ! -f ~/dotfiles/zsh/.p10k.mac.zsh ]] || source ~/dotfiles/zsh/.p10k.mac.zsh
|
||||||
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user