about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--flake/packages/default.nix5
1 files changed, 2 insertions, 3 deletions
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index a78b45c5..7d91f2bf 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -30,15 +30,14 @@
             config = value.config.home-manager.users.soispha;
           };
 
-        merge_attrs = list_of_attrs: merge list_of_attrs;
         resolve_imports = attrs:
-          merge_attrs (builtins.map (v: import v build_args)
+          merge (builtins.map (v: import v build_args)
             attrs.imports);
 
         resolve_imports' = attrs:
           if builtins.any (n: n == "imports") (builtins.attrNames attrs)
           then
-            resolve_imports' (merge_attrs [
+            resolve_imports' (merge [
               (resolve_imports attrs)
               (builtins.removeAttrs
                 attrs