Merge branch 'master'

tmux/.tmux.conf

@@ -29,7 +29,7 @@ unbind '%'
 bind-key -n C-x resize-pane -Z
 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
 

zsh/.zshrc

@@ -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