Merge branch 'master'

This commit is contained in:
Fabian Ising committed 2022-02-17 10:00:24 +01:00
commit 5f7464780f
3 files changed
+1729 -2

No files matched your search

+1722
View File
File diff suppressed because it is too large. Load diff
+6 -1
View File
@@ -36,6 +36,7 @@ antigen bundle go
# antigen bundle tmuxinator
antigen bundle zsh-users/zsh-syntax-highlighting
antigen bundle zsh-users/zsh-autosuggestions
antigen bundle zsh-users/zsh-completions
antigen bundle urbainvaes/fzf-marks
# For SSH, starting ssh-agent is annoying
@@ -82,4 +83,8 @@ export MITMPROXY_SSLKEYLOGFILE="~/.mitmproxy/sslkeylogfile.txt"
ZLE_RPROMPT_INDENT=0
# 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