From e0a14e8603a70c74032e51891b35af96e1007a1d Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Thu, 10 Nov 2022 13:44:49 -0600
Subject: [PATCH 1/3] Don't have conflicting config options

Oops :sweat_smile:
---
 vimrc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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

From 5bcf618c0b4b9ae34df229e4a187df0ebb05bb8d Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Thu, 10 Nov 2022 13:50:51 -0600
Subject: [PATCH 2/3] Ensure .cargo/env is present

Simply because ~/.cargo exists doesn't mean rustup is present.
---
 zshrc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
 

From 87773b73093a746e336d9e70b2dcf835fc1af181 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Thu, 10 Nov 2022 13:52:07 -0600
Subject: [PATCH 3/3] Update vim-airline-themes

---
 vim/pack/normal/start/vim-airline-themes | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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