From a68c001f0e20790ac9219d14fe3dbaac4fe618e0 Mon Sep 17 00:00:00 2001
From: Payas Relekar <payas@relekar.org>
Date: Fri, 14 Jul 2023 22:59:15 +0530
Subject: [PATCH] hermes: Use direnv module from NixOS instead of home-manager

---
 hosts/hermes/configuration.nix | 28 ++++++++++++++++------------
 hosts/hermes/emacs.nix         |  7 -------
 modules/nix.nix                |  3 ---
 3 files changed, 16 insertions(+), 22 deletions(-)

diff --git a/hosts/hermes/configuration.nix b/hosts/hermes/configuration.nix
index e8ab9e3..a4857ee 100644
--- a/hosts/hermes/configuration.nix
+++ b/hosts/hermes/configuration.nix
@@ -39,17 +39,21 @@
     };
   };
 
-  programs.nix-ld = {
-    enable = true;
-    libraries = with pkgs; [
-      # stdenv.cc.cc
-      zlib
-      fuse3
-      icu
-      nss
-      openssl
-      curl
-      expat
-    ];
+  programs = {
+    direnv.enable = true;
+
+    nix-ld = {
+      enable = true;
+      libraries = with pkgs; [
+        # stdenv.cc.cc
+        zlib
+        fuse3
+        icu
+        nss
+        openssl
+        curl
+        expat
+      ];
+    };
   };
 }
diff --git a/hosts/hermes/emacs.nix b/hosts/hermes/emacs.nix
index 0d22e98..4aada1e 100644
--- a/hosts/hermes/emacs.nix
+++ b/hosts/hermes/emacs.nix
@@ -51,13 +51,6 @@ in
         treesit-grammars.with-all-grammars
       ];
     };
-
-    direnv = {
-      enable = true;
-      enableBashIntegration = true;
-      enableFishIntegration = true;
-      nix-direnv.enable = true;
-    };
   };
 
   home.packages = with pkgs; [
diff --git a/modules/nix.nix b/modules/nix.nix
index 41cc0f1..770b58c 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -1,11 +1,8 @@
 { config, lib, options, pkgs, ... }:
 {
   nix = {
-    # Enable Flakes systemwide, and set gc-roots for nix-direnv
     extraOptions = ''
       experimental-features = nix-command flakes ca-derivations
-      keep-outputs = true
-      keep-derivations = true
     '';
 
     # Automated gabrage collection