diff --git a/cachix/mjlbach.nix b/cachix/mjlbach.nix
deleted file mode 100644
index 1265e9c..0000000
--- a/cachix/mjlbach.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  nix = {
-    binaryCaches = [ "https://mjlbach.cachix.org" ];
-    binaryCachePublicKeys =
-      [ "mjlbach.cachix.org-1:dR0V90mvaPbXuYria5mXvnDtFibKYqYc2gtl9MWSkqI=" ];
-  };
-}
diff --git a/cachix/nix-community.nix b/cachix/nix-community.nix
new file mode 100644
index 0000000..b0a63e9
--- /dev/null
+++ b/cachix/nix-community.nix
@@ -0,0 +1,8 @@
+{
+  nix = {
+    binaryCaches = [ "https://nix-community.cachix.org" ];
+    binaryCachePublicKeys = [
+      "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+    ];
+  };
+}
diff --git a/modules/periodic.nix b/modules/periodic.nix
index 6321ccd..ecdf5d9 100644
--- a/modules/periodic.nix
+++ b/modules/periodic.nix
@@ -6,7 +6,7 @@
   systemd.user.services.doom-upgrade = {
     description = "Upgrade Doom Emacs";
     wantedBy = [ "default.target" ];
-    path = with pkgs; [ bash emacsGccPgtk git coreutils ];
+    path = with pkgs; [ bash emacsPgtkGcc git coreutils ];
     script =
       "${pkgs.bash}/bin/bash -c '/home/coolneng/.emacs.d/bin/doom -y upgrade'";
     serviceConfig = { Type = "oneshot"; };
@@ -25,7 +25,7 @@
   systemd.user.services.doom-purge = {
     description = "Purge Doom Emacs";
     wantedBy = [ "default.target" ];
-    path = with pkgs; [ bash emacsGccPgtk git coreutils ];
+    path = with pkgs; [ bash emacsPgtkGcc git coreutils ];
     script =
       "${pkgs.bash}/bin/bash -c '/home/coolneng/.emacs.d/bin/doom -y purge'";
     serviceConfig = { Type = "oneshot"; };
@@ -45,10 +45,8 @@
     description = "Upgrade Vim-Plug";
     wantedBy = [ "default.target" ];
     path = [ pkgs.git pkgs.neovim ];
-    serviceConfig = {
-      Type = "oneshot";
-      ExecStart = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
-    };
+    script = "${pkgs.neovim}/bin/nvim +PlugUpgrade +PlugUpdate +qa";
+    serviceConfig = { Type = "oneshot"; };
   };
 
   systemd.user.timers.vim-plug-upgrade = {
diff --git a/modules/software.nix b/modules/software.nix
index eef6728..ab87f7d 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -20,7 +20,7 @@
     haskellPackages.pandoc-citeproc
     # Text editors
     neovim
-    emacsGccPgtk
+    emacsPgtkGcc
     ripgrep
     fd
     clang
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index b07d40b..4ce2fd6 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -2,7 +2,7 @@
   nixpkgs.overlays = [
     (import (builtins.fetchTarball {
       url =
-        "https://github.com/mjlbach/emacs-pgtk-nativecomp-overlay/archive/master.tar.gz";
+        "https://github.com/nix-community/emacs-overlay/archive/master.tar.gz";
     }))
   ];
 }