diff --git a/.editorconfig b/.editorconfig
index 395bb435bf66..9f0706d981a5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -85,47 +85,10 @@ charset = unset
 [eggs.nix]
 trim_trailing_whitespace = unset
 
-[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
-trim_trailing_whitespace = unset
-
-[pkgs/build-support/dotnet/dotnetenv/Wrapper/**]
-end_of_line = unset
-indent_style = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-
 [registry.dat]
 end_of_line = unset
 insert_final_newline = unset
 
-[pkgs/development/haskell-modules/hackage-packages.nix]
-indent_style = unset
-trim_trailing_whitespace = unset
-
-[pkgs/misc/documentation-highlighter/**]
-insert_final_newline = unset
-
-[pkgs/servers/dict/wordnet_structures.py]
-trim_trailing_whitespace = unset
-
-[pkgs/by-name/ti/timidity/timidity.cfg]
-trim_trailing_whitespace = unset
-
-[pkgs/tools/security/qdigidoc/vendor/*]
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-
-[pkgs/by-name/ov/ovftool/*.ova]
-end_of_line = unset
-insert_final_newline = unset
-trim_trailing_whitespace = unset
-charset = unset
-
-[lib/tests/*.plist]
-indent_style = tab
-insert_final_newline = unset
-
-[pkgs/kde/generated/**]
-insert_final_newline = unset
-end_of_line = unset
+# Keep this hint at the bottom:
+# Please don't add entries for subfolders here.
+# Create <subfolder>/.editorconfig instead.
diff --git a/lib/tests/.editorconfig b/lib/tests/.editorconfig
new file mode 100644
index 000000000000..7853c13cecf3
--- /dev/null
+++ b/lib/tests/.editorconfig
@@ -0,0 +1,3 @@
+[*.plist]
+indent_style = tab
+insert_final_newline = unset
diff --git a/nixos/modules/services/networking/ircd-hybrid/.editorconfig b/nixos/modules/services/networking/ircd-hybrid/.editorconfig
new file mode 100644
index 000000000000..de54d884adbd
--- /dev/null
+++ b/nixos/modules/services/networking/ircd-hybrid/.editorconfig
@@ -0,0 +1,2 @@
+[*.{conf,in}]
+trim_trailing_whitespace = unset
diff --git a/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig b/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig
new file mode 100644
index 000000000000..15ffe1f4b563
--- /dev/null
+++ b/pkgs/build-support/dotnet/dotnetenv/Wrapper/.editorconfig
@@ -0,0 +1,5 @@
+[*]
+end_of_line = unset
+indent_style = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
diff --git a/pkgs/by-name/ov/ovftool/.editorconfig b/pkgs/by-name/ov/ovftool/.editorconfig
new file mode 100644
index 000000000000..1eadccb7c232
--- /dev/null
+++ b/pkgs/by-name/ov/ovftool/.editorconfig
@@ -0,0 +1,5 @@
+[*.ova]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+charset = unset
diff --git a/pkgs/by-name/ti/timidity/.editorconfig b/pkgs/by-name/ti/timidity/.editorconfig
new file mode 100644
index 000000000000..000113a94410
--- /dev/null
+++ b/pkgs/by-name/ti/timidity/.editorconfig
@@ -0,0 +1,2 @@
+[timidity.cfg]
+trim_trailing_whitespace = unset
diff --git a/pkgs/development/haskell-modules/.editorconfig b/pkgs/development/haskell-modules/.editorconfig
new file mode 100644
index 000000000000..de310be0cf85
--- /dev/null
+++ b/pkgs/development/haskell-modules/.editorconfig
@@ -0,0 +1,3 @@
+[hackage-packages.nix]
+indent_style = unset
+trim_trailing_whitespace = unset
diff --git a/pkgs/kde/generated/.editorconfig b/pkgs/kde/generated/.editorconfig
new file mode 100644
index 000000000000..f3dddf6df2e6
--- /dev/null
+++ b/pkgs/kde/generated/.editorconfig
@@ -0,0 +1,3 @@
+[*]
+insert_final_newline = unset
+end_of_line = unset
diff --git a/pkgs/misc/documentation-highlighter/.editorconfig b/pkgs/misc/documentation-highlighter/.editorconfig
new file mode 100644
index 000000000000..9ccdc724d4f3
--- /dev/null
+++ b/pkgs/misc/documentation-highlighter/.editorconfig
@@ -0,0 +1,2 @@
+[*]
+insert_final_newline = unset
diff --git a/pkgs/servers/dict/.editorconfig b/pkgs/servers/dict/.editorconfig
new file mode 100644
index 000000000000..cd4aff0e2b1a
--- /dev/null
+++ b/pkgs/servers/dict/.editorconfig
@@ -0,0 +1,2 @@
+[wordnet_structures.py]
+trim_trailing_whitespace = unset
diff --git a/pkgs/tools/security/qdigidoc/vendor/.editorconfig b/pkgs/tools/security/qdigidoc/vendor/.editorconfig
new file mode 100644
index 000000000000..b64983d0d5bb
--- /dev/null
+++ b/pkgs/tools/security/qdigidoc/vendor/.editorconfig
@@ -0,0 +1,4 @@
+[*]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset