diff --git a/modules/periodic.nix b/modules/periodic.nix
index 09a1913..3a04c64 100644
--- a/modules/periodic.nix
+++ b/modules/periodic.nix
@@ -1,10 +1,16 @@
 { config, lib, pkgs, ... }:
 
-{
+with pkgs;
+
+let
+  emacs-vterm = ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages
+    (epkgs: with epkgs; [ vterm ]));
+
+in {
   # Upgrade Doom Emacs daily
   systemd.user.services.doom-upgrade = {
     description = "Upgrade Doom Emacs";
-    path = with pkgs; [ bash emacsPgtkGcc git coreutils ];
+    path = [ bash emacs-vterm git coreutils ];
     script = ''
       ${pkgs.bash}/bin/bash -c "/home/coolneng/.emacs.d/bin/doom -y upgrade"
     '';
@@ -15,7 +21,7 @@
   # Clean up Doom Emacs monthly
   systemd.user.services.doom-purge = {
     description = "Purge Doom Emacs";
-    path = with pkgs; [ bash emacsPgtkGcc git coreutils ];
+    path = [ bash emacs-vterm git coreutils ];
     script = ''
       ${pkgs.bash}/bin/bash -c "/home/coolneng/.emacs.d/bin/doom -y purge"
     '';
@@ -45,7 +51,7 @@
   systemd.user.services.goimapnotify-uni = {
     description = "Sync uni mail using IMAP IDLE";
     wantedBy = [ "default.target" ];
-    path = with pkgs; [ goimapnotify pass-wayland isync notmuch ];
+    path = [ goimapnotify pass-wayland isync notmuch ];
     script = ''
       ${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/uni.conf
     '';
@@ -60,7 +66,7 @@
   systemd.user.services.goimapnotify-gmail = {
     description = "Sync gmail mail using IMAP IDLE";
     wantedBy = [ "default.target" ];
-    path = with pkgs; [ goimapnotify pass-wayland isync notmuch ];
+    path = [ goimapnotify pass-wayland isync notmuch ];
     script = ''
       ${pkgs.goimapnotify}/bin/goimapnotify -conf /home/coolneng/.config/goimapnotify/gmail.conf
     '';
diff --git a/modules/software.nix b/modules/software.nix
index 8020ead..69c12e3 100644
--- a/modules/software.nix
+++ b/modules/software.nix
@@ -1,7 +1,13 @@
 { config, lib, pkgs, ... }:
 
-{
-  environment.systemPackages = with pkgs; [
+with pkgs;
+
+let
+  emacs-vterm = ((emacsPackagesNgGen emacsPgtkGcc).emacsWithPackages
+    (epkgs: with epkgs; [ vterm ]));
+
+in {
+  environment.systemPackages = [
     # Monitoring
     htop
     acpi
@@ -18,7 +24,7 @@
     pandoc
     # Text editors
     neovim
-    emacsPgtkGcc
+    emacs-vterm
     ripgrep
     fd
     clang