diff --git a/configuration.nix b/configuration.nix
index b9eedb4..8752507 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -103,6 +103,7 @@
     ./modules/printing.nix
     ./modules/periodic.nix
     ./modules/power.nix
+    ./overlays/emacs-overlay.nix
   ];
 
 }
diff --git a/modules/software.nix b/modules/software.nix
index 2bac0e4..4d8a225 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -20,7 +20,7 @@
     haskellPackages.pandoc-citeproc
     # Text editors
     neovim
-    emacs
+    emacsGcc
     ripgrep
     fd
     clang
diff --git a/overlays/emacs-overlay.nix b/overlays/emacs-overlay.nix
new file mode 100644
index 0000000..cb2a8cf
--- /dev/null
+++ b/overlays/emacs-overlay.nix
@@ -0,0 +1,7 @@
+{
+  nixpkgs.overlays = [
+    (import (builtins.fetchTarball {
+      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
+    }))
+  ];
+}