From 0e0ebc1502bc909aa6d3737ffea670b49201317f Mon Sep 17 00:00:00 2001
From: Antoine Viallon <antoine@lesviallon.fr>
Date: Tue, 8 Feb 2022 12:08:04 +0100
Subject: [PATCH] [General/Cleanup] Simplify nixConfig generator

---
 general.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/general.nix b/general.nix
index 8b76f59..813b0ac 100644
--- a/general.nix
+++ b/general.nix
@@ -9,16 +9,17 @@ let
     else if isList value then toString value
     else generators.mkValueStringDefault { } value;
 
+  isNullOrEmpty = v: (v == null) ||
+      (isList v && (length v == 0));
+
   nixConfig = settings: (generators.toKeyValue {
     mkKeyValue = generators.mkKeyValueDefault {
       mkValueString = nixConfigValue;
     } " = ";
-  } (filterAttrs (n: v: !(
-      (v == null) ||
-      (isList v && (length v == 0))
-    ))
+  } (filterAttrs (n: v: !(isNullOrEmpty v))
     settings)
   );
+
 in
 {
   options.aviallon.general = {