diff --git a/nixos/justfile b/nixos/justfile
index ac80571b..b6c15acb 100644
--- a/nixos/justfile
+++ b/nixos/justfile
@@ -1,4 +1,10 @@
 switch *args:
+	bash -lc 'if systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; then \
+	  echo "nixos-rebuild switch already running; waiting..." >&2; \
+	  systemctl status nixos-rebuild-switch-to-configuration.service --no-pager >&2 || true; \
+	  while systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; do sleep 1; done; \
+	fi; \
+	env PATH=/run/wrappers/bin:$PATH sudo systemctl reset-failed nixos-rebuild-switch-to-configuration.service >/dev/null 2>&1 || true'
 	env PATH=/run/wrappers/bin:$PATH sudo nixos-rebuild switch --flake ".#" --impure --option warn-dirty false \
 	  --override-input imalison-taffybar path:/home/imalison/dotfiles/dotfiles/config/taffybar \
 	  --override-input taffybar path:/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \
@@ -6,10 +12,16 @@ switch *args:
 
 switch-remote *args:
 	# Switch using the remote master flake.
-	sudo nixos-rebuild switch --flake "git+https://github.com/colonelpanic8/dotfiles.git?ref=master&dir=nixos#" --impure --option warn-dirty false {{args}}
+	env PATH=/run/wrappers/bin:$PATH sudo nixos-rebuild switch --flake "git+https://github.com/colonelpanic8/dotfiles.git?ref=master&dir=nixos#" --impure --option warn-dirty false {{args}}
 
 switch-local *args:
 	# Backwards-compat alias for local switch.
+	bash -lc 'if systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; then \
+	  echo "nixos-rebuild switch already running; waiting..." >&2; \
+	  systemctl status nixos-rebuild-switch-to-configuration.service --no-pager >&2 || true; \
+	  while systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; do sleep 1; done; \
+	fi; \
+	env PATH=/run/wrappers/bin:$PATH sudo systemctl reset-failed nixos-rebuild-switch-to-configuration.service >/dev/null 2>&1 || true'
 	env PATH=/run/wrappers/bin:$PATH sudo nixos-rebuild switch --flake ".#" --impure --option warn-dirty false \
 	  --override-input imalison-taffybar path:/home/imalison/dotfiles/dotfiles/config/taffybar \
 	  --override-input taffybar path:/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \
@@ -22,7 +34,8 @@ switch-local-taffybar *args:
 	  echo "nixos-rebuild switch already running; waiting..." >&2; \
 	  systemctl status nixos-rebuild-switch-to-configuration.service --no-pager >&2 || true; \
 	  while systemctl is-active --quiet nixos-rebuild-switch-to-configuration.service; do sleep 1; done; \
-	fi'
+	fi; \
+	env PATH=/run/wrappers/bin:$PATH sudo systemctl reset-failed nixos-rebuild-switch-to-configuration.service >/dev/null 2>&1 || true'
 	env PATH=/run/wrappers/bin:$PATH sudo env IMALISON_TAFFYBAR_LIVE_CHECKOUT=/home/imalison/dotfiles/dotfiles/config/taffybar/taffybar \
 	  nixos-rebuild switch --flake "git+https://github.com/colonelpanic8/dotfiles.git?ref=master&dir=nixos#" --impure --option warn-dirty false \
 	  --override-input imalison-taffybar path:/home/imalison/dotfiles/dotfiles/config/taffybar \