Merge branch 'main' into server

zsh/.gitignore

@@ -1,2 +1,3 @@
 .*_config*
 !.*_config*.example
+.p10k.mac.zsh

zsh/.p10k.zsh

@@ -31,7 +31,11 @@
   # The list of segments shown on the left. Fill it with the most important segments.
   typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(
     # os_icon               # os identifier
+<<<<<<< HEAD
     context
+=======
+    context                 # user@hostname
+>>>>>>> main
     dir                     # current directory
     vcs                     # git status
     # prompt_char           # prompt symbol
@@ -80,7 +84,11 @@
     gcloud                  # google cloud cli account and project (https://cloud.google.com/)
     google_app_cred         # google application credentials (https://cloud.google.com/docs/authentication/production)
     toolbox                 # toolbox name (https://github.com/containers/toolbox)
+<<<<<<< HEAD
     # context                 # user@hostname
+=======
+    #context                 # user@hostname
+>>>>>>> main
     nordvpn                 # nordvpn connection status, linux only (https://nordvpn.com/)
     ranger                  # ranger shell (https://github.com/ranger/ranger)
     nnn                     # nnn shell (https://github.com/jarun/nnn)

zsh/.powerline_config_arch.example

@@ -1 +1 @@
-source /usr/lib/python3.8/site-packages/powerline/bindings/zsh/powerline.zsh
+source /usr/lib/python3.10/site-packages/powerline/bindings/zsh/powerline.zsh

zsh/.virtual_env_config.zsh_mac.example

@@ -0,0 +1,4 @@
+export WORKON_HOME=~/python-envs
+export VIRTUALENVWRAPPER_VIRTUALENV=/usr/local/bin/virtualenv
+mkdir -p $WORKON_HOME
+source /usr/local/bin/virtualenvwrapper.sh

zsh/.zsh_plugins.txt

@@ -0,0 +1,22 @@
+# Load OMZ plugins
+ohmyzsh/ohmyzsh
+ohmyzsh/ohmyzsh path:plugins/git
+ohmyzsh/ohmyzsh path:plugins/golang
+ohmyzsh/ohmyzsh path:plugins/ssh-agent
+ohmyzsh/ohmyzsh path:plugins/pip
+ohmyzsh/ohmyzsh path:plugins/python
+ohmyzsh/ohmyzsh path:plugins/virtualenv
+ohmyzsh/ohmyzsh path:plugins/python
+
+
+romkatv/powerlevel10k
+zsh-users/zsh-syntax-highlighting
+zsh-users/zsh-autosuggestions
+zsh-users/zsh-completions
+zsh-users/zsh-history-substring-search
+urbainvaes/fzf-marks
+greymd/docker-zsh-completion
+zdharma-continuum/fast-syntax-highlighting kind:defer
+
+# Initialize completions
+belak/zsh-utils path:completion

zsh/.zshrc

@@ -12,45 +12,23 @@ export PATH="$HOME/.local/bin:$PATH"
 [[ -f /usr/share/doc/find-the-command/ftc.zsh ]] && source /usr/share/doc/find-the-command/ftc.zsh
 [[ -f ~/.zsh/.local_config ]] && source ~/.zsh/.local_config
 
-# Load Antigen
+# Load Antidote
+static_file=${ZDOTDIR:-~}/.cache/.zsh_plugins.zsh
+plugins_txt=${ZDOTDIR:-~}/.zsh/.zsh_plugins.txt
+# clone antidote if necessary
+if ! [[ -e ${ZDOTDIR:-~}/.antidote ]]; then
+  git clone https://github.com/mattmc3/antidote.git ${ZDOTDIR:-~}/.antidote
+fi
+
+# source antidote and load plugins from `${ZDOTDIR:-~}/.zsh_plugins.txt`
+source ${ZDOTDIR:-~}/.antidote/antidote.zsh
+antidote load ${plugins_txt} ${static_file}
+
 setopt interactivecomments
 setopt HIST_IGNORE_SPACE
-source ~/.zsh/antigen/antigen.zsh
-
 # Clear screen by ctrl+q
 bindkey '^q' clear-screen
 
-# Load various lib files
-antigen use oh-my-zsh
-
-# Antigen Theme
-antigen theme romkatv/powerlevel10k powerlevel10k
-
-# Antigen Bundles
-
-antigen bundle git
-antigen bundle heroku
-#antigen bundle command-not-found
-antigen bundle go
-
-# antigen bundle tmuxinator
-antigen bundle zsh-users/zsh-syntax-highlighting
-antigen bundle zsh-users/zsh-autosuggestions
-antigen bundle urbainvaes/fzf-marks
-
-# For SSH, starting ssh-agent is annoying
-antigen bundle ssh-agent
-
-# Python Plugins
-antigen bundle pip
-antigen bundle python
-antigen bundle virtualenv
-
-antigen bundle virtualenv
-
-antigen bundle "greymd/docker-zsh-completion"
-
-antigen apply
 alias vim=nvim
 alias sudo='sudo '
 export EDITOR='nvim'
@@ -82,4 +60,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.zsh ]] || source ~/dotfiles/zsh/.p10k.zsh
+fi