From cb3e57b901316582d99a5a9bb6f408e827cf09ae Mon Sep 17 00:00:00 2001 From: RGBCube Date: Thu, 23 Nov 2023 16:01:37 +0300 Subject: [PATCH] Fix infinite recursion somewhat --- flake.nix | 2 +- machines/enka/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.nix b/flake.nix index 839160e..501df4c 100644 --- a/flake.nix +++ b/flake.nix @@ -43,7 +43,7 @@ ulib = rec { recursiveUpdate3 = x: y: z: lib.recursiveUpdate x (lib.recursiveUpdate y z); - imports = paths: { + importAll = paths: { imports = paths; }; diff --git a/machines/enka/default.nix b/machines/enka/default.nix index 1e271f0..23fbf05 100644 --- a/machines/enka/default.nix +++ b/machines/enka/default.nix @@ -1,4 +1,4 @@ -{ recursiveUpdate3, systemConfiguration, homeConfiguration, imports, ... }: recursiveUpdate3 +{ recursiveUpdate3, systemConfiguration, homeConfiguration, importAll, ... }: recursiveUpdate3 (systemConfiguration { boot.loader = { @@ -14,7 +14,7 @@ home.stateVersion = "23.05"; }) -(imports [ +(importAll [ ./bat ./blueman ./discord