diff --git a/TODO.md b/TODO.md
index 468f5af..eed8f3b 100644
--- a/TODO.md
+++ b/TODO.md
@@ -23,6 +23,7 @@ A list of in-progress and completed todo's.
     - [x] Add gpg public key import into `runs/after/system`
     - [ ] Need to ensure ssh keys are setup before private submodules are loaded / installed,
     so I need to make sure that Yubikey setup runs early and works for ssh authentication.
+    - [ ] Setup a new machine / virtual machine to test, as it's hard to test the scripts once a machine is setup.
 
 ### Keyboard / kanata
 
diff --git a/env/.config/nvim b/env/.config/nvim
index 03aaaa6..68d7743 160000
--- a/env/.config/nvim
+++ b/env/.config/nvim
@@ -1 +1 @@
-Subproject commit 03aaaa6f74f4eda4d20bf23e985977b60c276c4d
+Subproject commit 68d7743a1c2c1fff41fd3be45c13395d9f6e4be1
diff --git a/runs/after/system b/runs/after/system
index 5e76db0..f92a923 100755
--- a/runs/after/system
+++ b/runs/after/system
@@ -49,6 +49,7 @@ _setup-gpg() {
 		source ./import
 	)
 	popd &>/dev/null || exit 1
+	rm -rf "$dir"
 }
 
 install() {