diff --git a/justfile b/justfile
index b50277f..5f9fbde 100644
--- a/justfile
+++ b/justfile
@@ -8,6 +8,8 @@ test hostname=(HOSTNAME):
 
 # Apply config on hostname
 switch hostname=(HOSTNAME):
+  @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @rm -f nixos-switch.log
   @colmena --impure exec --on {{hostname}} "locate home-manager-backup | sort -u | xargs rm -f"
   @colmena --impure apply --on {{hostname}}
 
@@ -18,16 +20,22 @@ world:
 
 # Build and install the workstations
 workstation:
+  @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @rm -f nixos-switch.log
   @colmena --impure exec --on @workstation "locate home-manager-backup | sort -u | xargs rm -f"
   @colmena --impure apply --on @workstation
 
 # Build and install the servers
 server:
+  @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @rm -f nixos-switch.log
   @colmena --impure exec --on @server "locate home-manager-backup | sort -u | xargs rm -f"
   @colmena --impure apply --on @server
 
 # Build and install the webhosts
 web:
+  @nixfmt . &> nixos-switch.log || ( cat nixos-switch.log && false )
+  @rm -f nixos-switch.log
   @colmena --impure exec --on @web "locate home-manager-backup | sort -u | xargs rm -f"
   @colmena --impure apply --on @web