diff --git a/Makefile b/Makefile
index 852fcddf0..c3cd8df04 100644
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,18 @@ asan:
 
 	ASAN_OPTIONS="detect_odr_violation=0,log_path=asan.log" HYPRLAND_NO_CRASHREPORTER=1 ./build/Hyprland -c ~/.config/hypr/hyprland.conf
 
+format-check:
+	@find src hyprctl hyprpm start tests -type f \( -name "*.cpp" -o -name "*.hpp" -o -name "*.h" \) \
+		! -path "src/render/shaders/Shaders.hpp" \
+		! -path "hyprctl/hw-protocols/*" | \
+		xargs clang-format --dry-run --Werror
+
+format-fix:
+	@find src hyprctl hyprpm start tests -type f \( -name "*.cpp" -o -name "*.hpp" -o -name "*.h" \) \
+		! -path "src/render/shaders/Shaders.hpp" \
+		! -path "hyprctl/hw-protocols/*" | \
+		xargs clang-format -i
+
 test:
 	$(MAKE) debug
 	./build/hyprtester/hyprtester -c hyprtester/test.conf -b ./build/Hyprland -p hyprtester/plugin/hyprtestplugin.so