diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..eb9227c
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,4 @@
+# yaml-language-server: $schema=https://json.schemastore.org/clang-format-21.x.json
+---
+BasedOnStyle: LLVM
+IndentWidth: 2
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..6f633de
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: https://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+[*]
+indent_style = space
+indent_size = 4
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+
+[{*.c,*.h}]
+indent_size = 2
+
+[{Makefile.*,Makefile}]
+indent_style = tab
+indent_size = 2
diff --git a/Makefile.dev b/Makefile.dev
index 82e9c13..e01931c 100644
--- a/Makefile.dev
+++ b/Makefile.dev
@@ -25,6 +25,10 @@ build:
 		-o build/$(TARGET) \
 		-g -Og
 
+.PHONY: format
+format:
+	clang-format -i src/*
+
 .PHONY: run
 run: build
 	./build/$(TARGET) $(TEST_ARGS) --monitor-only --internal-size=480 --video-size=240 --hot-reload
@@ -101,4 +105,3 @@ release-arch: clean
 	mkdir -p build
 	cp PKGBUILD build
 	cd build && makepkg
-