diff --git a/base/defaults.nix b/base/defaults.nix
index b42a3e6..1dd5768 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -13,6 +13,8 @@
             };
         };
 
+        programs.direnv.enable = true;
+
         nix.gc = {
             automatic = true;
             dates = "weekly";
diff --git a/base/packages.nix b/base/packages.nix
index 5ee50a4..a572cfe 100644
--- a/base/packages.nix
+++ b/base/packages.nix
@@ -1,7 +1,6 @@
 { config, pkgs, lib, ... }:
 {
     environment.systemPackages = with pkgs; [
-        direnv nix-direnv
         tmux zellij
         wget
         rsync
diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index a8b5590..07ca909 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -26,7 +26,6 @@
 
     environment.systemPackages = with pkgs; [
         ntfsprogs
-        direnv nix-direnv
         tmux zellij
         helix
         picocom
diff --git a/hosts/Ernesto.nix b/hosts/Ernesto.nix
index 2e6f6e0..f0cd9f3 100644
--- a/hosts/Ernesto.nix
+++ b/hosts/Ernesto.nix
@@ -57,7 +57,6 @@
 
     environment.systemPackages = with pkgs; [
         ntfsprogs
-        direnv nix-direnv
         tmux zellij
         helix
         picocom