diff --git a/cachix/mjlbach.nix b/cachix/mjlbach.nix
new file mode 100644
index 0000000..1265e9c
--- /dev/null
+++ b/cachix/mjlbach.nix
@@ -0,0 +1,7 @@
+{
+  nix = {
+    binaryCaches = [ "https://mjlbach.cachix.org" ];
+    binaryCachePublicKeys =
+      [ "mjlbach.cachix.org-1:dR0V90mvaPbXuYria5mXvnDtFibKYqYc2gtl9MWSkqI=" ];
+  };
+}
diff --git a/cachix/nix-community.nix b/cachix/nix-community.nix
deleted file mode 100644
index b0a63e9..0000000
--- a/cachix/nix-community.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://nix-community.cachix.org" ];
-    binaryCachePublicKeys = [
-      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-    ];
-  };
-}
diff --git a/configuration.nix b/configuration.nix
index 0720f46..32f0778 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -105,7 +105,7 @@
     ./modules/periodic.nix
     ./modules/power.nix
     ./modules/cachix.nix
-    ./overlays/emacs-overlay.nix
+    ./overlays/emacs.nix
   ];
 
 }
diff --git a/modules/software.nix b/modules/software.nix
index 7d405f9..e7fe81b 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -20,7 +20,7 @@
     haskellPackages.pandoc-citeproc
     # Text editors
     neovim
-    emacsGcc
+    emacsGccPgtk
     ripgrep
     fd
     clang
diff --git a/overlays/emacs-overlay.nix b/overlays/emacs-overlay.nix
deleted file mode 100644
index cb2a8cf..0000000
--- a/overlays/emacs-overlay.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  nixpkgs.overlays = [
-    (import (builtins.fetchTarball {
-      url = https://github.com/nix-community/emacs-overlay/archive/master.tar.gz;
-    }))
-  ];
-}
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
new file mode 100644
index 0000000..b07d40b
--- /dev/null
+++ b/overlays/emacs.nix
@@ -0,0 +1,8 @@
+{
+  nixpkgs.overlays = [
+    (import (builtins.fetchTarball {
+      url =
+        "https://github.com/mjlbach/emacs-pgtk-nativecomp-overlay/archive/master.tar.gz";
+    }))
+  ];
+}