diff --git a/modules/programs.nix b/modules/programs.nix
index 4146335..7b96583 100644
--- a/modules/programs.nix
+++ b/modules/programs.nix
@@ -22,6 +22,7 @@
     pciutils
     glxinfo
     btop
+    alejandra
 
     # Development
     code-cursor
diff --git a/rebuild-nix-system.sh b/rebuild-nix-system.sh
index b9405c0..af877ce 100755
--- a/rebuild-nix-system.sh
+++ b/rebuild-nix-system.sh
@@ -25,6 +25,17 @@ else
     fi
 fi
 
+# Early return if no changes were detected
+if git diff --quiet '*.nix'; then
+    echo "No changes detected, exiting."
+    popd
+    exit 0
+fi
+
+# Autoformat your nix files
+alejandra . &>/dev/null \
+  || ( alejandra . ; echo "formatting failed!" && exit 1)
+
 # Shows your changes
 git diff -U0 '*.nix'