2 files changed, 4 insertions, 0 deletions
diff --git a/modules/workstation/emacs/default.nix b/modules/workstation/emacs/default.nix
index 1bd2885288eb..b998a16f6d60 100644
--- a/modules/workstation/emacs/default.nix
+++ b/modules/workstation/emacs/default.nix
@@ -8,6 +8,7 @@
       csharp-mode
       direnv
       dockerfile-mode
+      editorconfig
       eglot
       elpher
       gnuplot-mode
diff --git a/modules/workstation/emacs/init.el b/modules/workstation/emacs/init.el
index a6b67483dfd1..6ff273bdc43e 100644
--- a/modules/workstation/emacs/init.el
+++ b/modules/workstation/emacs/init.el
@@ -82,6 +82,9 @@
 ;; Don't make a new frame for Ediff controls.
 (setq ediff-window-setup-function 'ediff-setup-windows-plain)
 
+;;; EditorConfig ;;;
+(editorconfig-mode)
+
 ;;; Eglot ;;;
 (with-eval-after-load 'eglot
   ;; Override default LSPs for languages.