From 570e2e0b8a61b1dddff6a89912c76860609c2ba1 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 11 Dec 2021 18:06:05 -0500
Subject: [PATCH] nix-direnv

---
 features/dev/nix-direnv.nix | 18 ------------------
 flake.nix                   |  1 -
 home.nix                    |  1 +
 3 files changed, 1 insertion(+), 19 deletions(-)
 delete mode 100644 features/dev/nix-direnv.nix

diff --git a/features/dev/nix-direnv.nix b/features/dev/nix-direnv.nix
deleted file mode 100644
index 89e1be6..0000000
--- a/features/dev/nix-direnv.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  # https://github.com/nix-community/nix-direnv
-  environment.systemPackages = with pkgs; [ direnv nix-direnv ];
-  # nix options for derivations to persist garbage collection
-  nix.extraOptions = ''
-    keep-outputs = true
-    keep-derivations = true
-  '';
-  environment.pathsToLink = [
-    "/share/nix-direnv"
-  ];
-  nixpkgs.overlays = [
-    (self: super: { nix-direnv = super.nix-direnv.override { enableFlakes = true; }; })
-  ];
-
-}
diff --git a/flake.nix b/flake.nix
index da26563..253b5d7 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,7 +48,6 @@
             ./features/caches
             ./features/current-location.nix
             ./features/passwordstore.nix
-            ./features/dev/nix-direnv.nix
 
             # home-manager configuration
             home-manager.nixosModules.home-manager
diff --git a/home.nix b/home.nix
index cb6b4f5..754b595 100644
--- a/home.nix
+++ b/home.nix
@@ -118,6 +118,7 @@ rec {
       enableBashIntegration = true;
       nix-direnv = {
         enable = true;
+        enableFlakes = true;
       };
     };