diff --git a/vim/pack/normal/start/vim-airline-themes b/vim/pack/normal/start/vim-airline-themes
index 55bad92..dd81554 160000
--- a/vim/pack/normal/start/vim-airline-themes
+++ b/vim/pack/normal/start/vim-airline-themes
@@ -1 +1 @@
-Subproject commit 55bad92d246a31e3425dfaf16b7eec657eab1fad
+Subproject commit dd81554c2231e438f6d0e8056ea38fd0e80ac02a
diff --git a/vimrc b/vimrc
index 14cd8ed..e0ff19b 100644
--- a/vimrc
+++ b/vimrc
@@ -7,9 +7,10 @@ set backspace=indent,eol,start
 
 " two-spaced tabs
 set tabstop=2
-set softtabstop=0 noexpandtab
+set softtabstop=0
 set shiftwidth=2
-set tabstop=2 softtabstop=0 expandtab shiftwidth=2 smarttab
+set noexpandtab
+set smarttab
 
 " custom filetypes
 autocmd BufNewFile,BufRead *.plist set syntax=xml
diff --git a/zshrc b/zshrc
index adda6d1..a90af02 100644
--- a/zshrc
+++ b/zshrc
@@ -103,7 +103,7 @@ if [ -d /nix ]; then
 fi
 
 # Rust
-if [ -d $HOME/.cargo ]; then
+if [ -d $HOME/.cargo/env ]; then
   source $HOME/.cargo/env
 fi