diff --git a/emacs/config.el b/emacs/config.el
index 1189215..cf96964 100644
--- a/emacs/config.el
+++ b/emacs/config.el
@@ -178,7 +178,10 @@
   :config
   (load-theme 'base16-oxocarbon-dark t))
 
-(use-package nix-ts-mode
+(use-package nix-mode
   :mode "\\.nix\\'")
 
+(use-package envrc
+  :hook (after-init . envrc-global-mode))
+
 (provide 'config)
diff --git a/emacs/mkEmacs.nix b/emacs/mkEmacs.nix
index 3abbf07..4abde92 100644
--- a/emacs/mkEmacs.nix
+++ b/emacs/mkEmacs.nix
@@ -34,7 +34,8 @@ in
             embark
             embark-consult
       	    base16-theme
-            nix-ts-mode
+            nix-mode
+            envrc
             ;
           treesit-grammars = e.treesit-grammars.with-all-grammars;
         };
diff --git a/flake.nix b/flake.nix
index 4418972..2572cc8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -38,8 +38,12 @@
           };
 
           packages = {
-            pankomacs = mkEmacs pkgs.emacs29-pgtk;
-            pankomacs-x11 = mkEmacs pkgs.emacs-gtk;
+            pankomacs = mkEmacs (pkgs.emacs29-pgtk.override {
+              withSystemd = false;
+            });
+            pankomacs-x11 = mkEmacs (pkgs.emacs-gtk.overide {
+              withSystemd = false;
+            });
           };
 
           formatter = pkgs.nixfmt-rfc-style;