From 838bcd1f5114c93473fdd920d49dc5abba6577bf Mon Sep 17 00:00:00 2001
From: David Arnold <david.arnold@iohk.io>
Date: Mon, 29 Nov 2021 18:07:21 -0500
Subject: [PATCH] nix-direnv: rm enableFlakes and pass nixUnstable

>        Failed assertions:
       - The option definition `programs.direnv.nix-direnv.enableFlakes' in `/nix/store/pv3vi4n7x83r4sc3ljqdgg9qifr4n5gp-source/users/profiles/direnv' no longer has any effect; please remove it.
       Flake support is now always enabled.
---
 overlays/overrides.nix            |  2 ++
 overlays/various-flake-fixes.nix  | 11 -----------
 users/profiles/direnv/default.nix |  1 -
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 overlays/various-flake-fixes.nix

diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 597817b2..4b48b6d1 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -15,6 +15,8 @@ channels: final: prev: {
     deploy-rs
     ;
 
+  # nix is set to 2.3 in 21.11
+  nix-direnv = prev.nix-direnv.override { nix = prev.nixUnstable; };
 
   haskellPackages = prev.haskellPackages.override
     (old: {
diff --git a/overlays/various-flake-fixes.nix b/overlays/various-flake-fixes.nix
deleted file mode 100644
index 7dbfc18b..00000000
--- a/overlays/various-flake-fixes.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-final: prev: {
-  # Since: https://github.com/NixOS/nixpkgs/pull/126137
-  nix-direnv =
-    if builtins.hasAttr "enableFlakes" prev.nix-direnv.override.__functionArgs
-    then
-      prev.nix-direnv.override
-        {
-          enableFlakes = true;
-        }
-    else prev.nix-direnv;
-}
diff --git a/users/profiles/direnv/default.nix b/users/profiles/direnv/default.nix
index d345e2d3..67ff2113 100644
--- a/users/profiles/direnv/default.nix
+++ b/users/profiles/direnv/default.nix
@@ -3,7 +3,6 @@
     enable = true;
     nix-direnv = {
       enable = true;
-      enableFlakes = true;
     };
   };
 }