diff --git a/.chezmoiignore b/.chezmoiignore
index 7e27303..72149d1 100644
--- a/.chezmoiignore
+++ b/.chezmoiignore
@@ -1,4 +1,6 @@
 deploy_dotfiles.sh
+.bin/*-amd64
+.bin/*-arm64
 .config/**/.git
 .config/**/.git/**
 !.config/nvim/pack/minpac/opt/minpac/.git
diff --git a/dot_bin/executable_bat b/dot_bin/bat-amd64
old mode 100644
new mode 100755
similarity index 100%
rename from dot_bin/executable_bat
rename to dot_bin/bat-amd64
diff --git a/dot_bin/bat-arm64 b/dot_bin/bat-arm64
new file mode 100755
index 0000000..ea42038
Binary files /dev/null and b/dot_bin/bat-arm64 differ
diff --git a/dot_bin/executable_bat.tmpl b/dot_bin/executable_bat.tmpl
new file mode 100644
index 0000000..499b329
--- /dev/null
+++ b/dot_bin/executable_bat.tmpl
@@ -0,0 +1 @@
+{{- include (printf "bat-%s" .chezmoi.arch) -}}
diff --git a/dot_bin/executable_dog b/dot_bin/executable_dog
old mode 100644
new mode 100755
index 46a9bde..3d26bb5
Binary files a/dot_bin/executable_dog and b/dot_bin/executable_dog differ
diff --git a/dot_bin/executable_fzf.tmpl b/dot_bin/executable_fzf.tmpl
new file mode 100644
index 0000000..e4bb828
--- /dev/null
+++ b/dot_bin/executable_fzf.tmpl
@@ -0,0 +1 @@
+{{- include (printf "fzf-%s" .chezmoi.arch) -}}
diff --git a/dot_bin/executable_sheldon.tmpl b/dot_bin/executable_sheldon.tmpl
new file mode 100644
index 0000000..a2e9081
--- /dev/null
+++ b/dot_bin/executable_sheldon.tmpl
@@ -0,0 +1 @@
+{{- include (printf "sheldon-%s" .chezmoi.arch) -}}
diff --git a/dot_bin/executable_zoxide.tmpl b/dot_bin/executable_zoxide.tmpl
new file mode 100644
index 0000000..26eea40
--- /dev/null
+++ b/dot_bin/executable_zoxide.tmpl
@@ -0,0 +1 @@
+{{- include (printf "zoxide-%s" .chezmoi.arch) -}}
diff --git a/dot_bin/executable_fzf b/dot_bin/fzf-amd64
old mode 100644
new mode 100755
similarity index 100%
rename from dot_bin/executable_fzf
rename to dot_bin/fzf-amd64
diff --git a/dot_bin/fzf-arm64 b/dot_bin/fzf-arm64
new file mode 100755
index 0000000..36069f3
Binary files /dev/null and b/dot_bin/fzf-arm64 differ
diff --git a/dot_bin/executable_sheldon b/dot_bin/sheldon-amd64
similarity index 100%
rename from dot_bin/executable_sheldon
rename to dot_bin/sheldon-amd64
diff --git a/dot_bin/sheldon-arm64 b/dot_bin/sheldon-arm64
new file mode 100755
index 0000000..eb00fc7
Binary files /dev/null and b/dot_bin/sheldon-arm64 differ
diff --git a/dot_bin/executable_zoxide b/dot_bin/zoxide-amd64
similarity index 100%
rename from dot_bin/executable_zoxide
rename to dot_bin/zoxide-amd64
diff --git a/dot_bin/zoxide-arm64 b/dot_bin/zoxide-arm64
new file mode 100755
index 0000000..0f14861
Binary files /dev/null and b/dot_bin/zoxide-arm64 differ
diff --git a/dot_sheldon/plugins.toml b/dot_sheldon/plugins.toml
index 9629551..1b73c61 100644
--- a/dot_sheldon/plugins.toml
+++ b/dot_sheldon/plugins.toml
@@ -42,6 +42,9 @@ github = 'greymd/tmux-xpanes'
 [plugins.zsh-autopair]
 github = 'hlissner/zsh-autopair'
 
+[plugins.zsh-autoswitch-virtualenv]
+github = 'MichaelAquilina/zsh-autoswitch-virtualenv'
+
 # For example:
 #
 # [plugins.base16]
diff --git a/dot_zsh/aliases.tmpl b/dot_zsh/aliases.tmpl
index c759c37..6e67b04 100644
--- a/dot_zsh/aliases.tmpl
+++ b/dot_zsh/aliases.tmpl
@@ -11,13 +11,13 @@ alias ta='tmux a'
 alias vi="nvim"
 alias vim="nvim"
 alias zz='zcat $1 | most'
-alias dig="dog --time A NS MX TXT AAAA SOA $1"
-alias ddig='/usr/bin/dig'
 
 {{ if eq .chezmoi.hostname "taupo" -}}
 alias cat="batcat"
 alias lah='exa -lbhHigmuSa --time-style=long-iso --git --color-scale'  # all list
 alias lxh='exa -lbhHigmuSa@ --time-style=long-iso --git --color-scale' # all + extended list
+alias dig="dog --time A NS MX TXT AAAA SOA $1"
+alias ddig='/usr/bin/dig'
 {{ else -}}
 alias cat="bat"
 {{ end -}}
diff --git a/private_dot_config/sheldon/plugins.toml b/private_dot_config/sheldon/plugins.toml
index 9629551..1b73c61 100644
--- a/private_dot_config/sheldon/plugins.toml
+++ b/private_dot_config/sheldon/plugins.toml
@@ -42,6 +42,9 @@ github = 'greymd/tmux-xpanes'
 [plugins.zsh-autopair]
 github = 'hlissner/zsh-autopair'
 
+[plugins.zsh-autoswitch-virtualenv]
+github = 'MichaelAquilina/zsh-autoswitch-virtualenv'
+
 # For example:
 #
 # [plugins.base16]