diff --git a/.gitignore b/.gitignore
index 6e9e5b9de..3a3b7cc3d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,34 +1,43 @@
+# build artifacts
+/build*
+/wadsrc/*.pk3
+/appimage-build
+.flatpak-builder/
+*.AppImage
+*.flatpak
+flatpak/
+gzdoom-crash.log
+fmodapi*linux/
+
+# generated code
+/src/gitinfo.h
+
+# editor/tooling/os files
+*~
+.gdb_history
+.DS_Store
+.vs
+.idea
+.vscode
+.cache
+*.kate-swp
+
+# private dev files
+*.user
+*.local
+*.log
+
+# other / unknown
 *.ncb
 *.suo
 *.pdb
 *.ilk
 *.aps
 /wadsrc_wad
-*.user
-/build
 /release_gcc
 /DOOMSTATS.TXT
-/src/gitinfo.h
-/wadsrc/*.pk3
 /disasm.txt
-/build_vc2015
-/build_vc2015-32
-/build_vc2015-64
-/build_vc2017-64
-/build
 /llvm
-.vs
-.idea
-.vscode
 /src/gl/unused
 /mapfiles_release/*.map
 /AppDir
-/appimage-build
-*.AppImage
-.DS_Store
-/build_vc2017-32
-/build2
-/build_vc2019-64
-/build_vc2019-32
-/build__
-gzdoom-crash.log