From a88633b66cc436e1f041b3b88dc7ed7f2377d498 Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.me>
Date: Sat, 5 Dec 2020 21:37:11 +0100
Subject: [PATCH] Use recursiveUpdate instead of //

---
 modules/nix.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/modules/nix.nix b/modules/nix.nix
index 769594f7..2fca9147 100644
--- a/modules/nix.nix
+++ b/modules/nix.nix
@@ -95,11 +95,14 @@ in
     ];
 
     home-manager.users.charlotte = { ... }:
-      (lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv) //
-      (lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree) //
-      (lib.optionalAttrs config.chvp.nix.enableNixIndex baseNixIndex);
+      lib.recursiveUpdate
+        (lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv)
+        (lib.recursiveUpdate
+          (lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree)
+          (lib.optionalAttrs config.chvp.nix.enableNixIndex baseNixIndex));
     home-manager.users.root = { ... }:
-      (lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv) //
-      (lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree);
+      lib.recursiveUpdate
+        (lib.optionalAttrs config.chvp.nix.enableDirenv baseDirenv)
+        (lib.optionalAttrs config.chvp.nix.enableUnfree baseUnfree);
   };
 }