refactor(wrapperModules.neovim): light refactor to normalization logic

Author: BirdeeHub

wrapperModules/n/neovim/default-config.nix

@@ -354,12 +354,14 @@
       config.binName = "neovim-ruby-host";
     };
   config.extraPackages =
-    lib.mkIf (config.hosts.ruby.nvim-host.enable || config.hosts.node.nvim-host.enable)
+    lib.mkIf
+      (config.hosts.ruby.nvim-host.enable or false || config.hosts.node.nvim-host.enable or false)
       (
-        lib.optional config.hosts.ruby.nvim-host.enable config.hosts.ruby.wrapper
-        ++ lib.optional config.hosts.node.nvim-host.enable pkgs.nodejs
+        lib.optional (config.hosts.ruby.nvim-host.enable or false) config.hosts.ruby.wrapper
+        ++ lib.optional (config.hosts.node.nvim-host.enable or false) pkgs.nodejs
       );
-  config.env.GEM_HOME = lib.mkIf (config.hosts.ruby.nvim-host.enable) "${config.hosts.ruby.package}/${config.hosts.ruby.package.ruby.gemPath}";
+  config.env.GEM_HOME = lib.mkIf (config.hosts.ruby.nvim-host.enable or false
+  ) "${config.hosts.ruby.package}/${config.hosts.ruby.package.ruby.gemPath or pkgs.ruby.gemPath}";
   config.hosts.neovide =
     {
       lib,

wrapperModules/n/neovim/normalize.nix

@@ -9,55 +9,49 @@
   ...
 }:
 let
-  mappedSpecs =
-    let
-      initialList =
-        let
-          pluginList = lib.pipe specs [
-            (lib.mapAttrsToList (
-              name: value:
-              if builtins.isList value.data then
-                {
-                  inherit name value;
-                  type = "parent";
-                }
-              else
-                {
-                  inherit name value;
-                  type = "spec";
-                }
-            ))
-            (lib.concatMap (
-              item:
-              if item.type == "parent" then
-                [
-                  (
-                    item
-                    // {
-                      value = item.value // {
-                        data = null;
-                      };
-                    }
-                  )
-                ]
-                ++ map (child: {
-                  name = item.name;
-                  value = child;
-                  type = "spec";
-                }) item.value.data
-              else
-                [ item ]
-            ))
-          ];
-          mappingFunctions = lib.pipe specMaps [
-            (wlib.dag.unwrapSort "specMaps DAL")
-            (builtins.filter (v: (v.enable or true)))
-            (map (v: v.data))
-          ];
-        in
-        lib.pipe pluginList mappingFunctions;
-    in
-    lib.pipe initialList [
+  mappedSpecs = lib.pipe specs (
+    [
+      (lib.mapAttrsToList (
+        name: value:
+        if builtins.isList value.data then
+          {
+            inherit name value;
+            type = "parent";
+          }
+        else
+          {
+            inherit name value;
+            type = "spec";
+          }
+      ))
+      (lib.concatMap (
+        item:
+        if item.type == "parent" then
+          [
+            (
+              item
+              // {
+                value = item.value // {
+                  data = null;
+                };
+              }
+            )
+          ]
+          ++ map (child: {
+            name = item.name;
+            value = child;
+            type = "spec";
+          }) item.value.data
+        else
+          [ item ]
+      ))
+    ]
+    ++ (lib.pipe specMaps [
+      (wlib.dag.unwrapSort "specMaps DAL")
+      (builtins.filter (v: (v.enable or true)))
+      (map (v: v.data))
+    ])
+    ++ [
       (builtins.filter (v: v ? name && v ? value && v ? type))
       (lib.partition (v: v.type == "parent"))
       (
@@ -146,7 +140,8 @@ let
       )
       (builtins.filter (v: if v ? enable then v.enable else true))
       (wlib.dag.unwrapSort "config and plugin DAG")
-    ];
+    ]
+  );
 
   getNameFromSpec =
     v: