treewide: drop redundant parentheses and eta-expand

flake/hosts.nix

@@ -13,7 +13,7 @@ let
     nixpkgs = lib.mkMerge [
       pkgsParams
       {
-        overlays = (import ./overlays args);
+        overlays = import ./overlays args;
       }
     ];
   };
@@ -57,13 +57,11 @@ in
 
             modules = lib.mkOption {
               type = lib.types.listOf lib.types.deferredModule;
-              default = (
+              default = lib.umport {
-                lib.umport {
+                paths = [ ../hosts/${name} ];
-                  paths = [ ../hosts/${name} ];
+                extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
-                  extraExcludePredicate = path: lib.hasInfix "/_" (toString path);
+                recursive = true;
-                  recursive = true;
+              };
-                }
-              );
               description = "Additional NixOS modules specific to this host";
             };
 

hosts/imxyy-nix-server/matrix.nix

@@ -6,15 +6,14 @@
   ...
 }:
 {
-  nixpkgs.config.permittedInsecurePackages = (
+  nixpkgs.config.permittedInsecurePackages =
     lib.warn
       ''
         mautrix-telegram still using olm-3.2.16
       ''
       [
         "olm-3.2.16"
-      ]
+      ];
-  );
   sops.secrets.tuwunel-reg-token = {
     sopsFile = secrets.tuwunel-reg-token;
     restartUnits = [ "tuwunel.service" ];

lib/umport.nix

@@ -19,8 +19,8 @@ let
     with lib;
     with fileset;
     let
-      excludedFiles = filter (path: pathIsRegularFile path) exclude;
+      excludedFiles = filter pathIsRegularFile exclude;
-      excludedDirs = filter (path: pathIsDirectory path) exclude;
+      excludedDirs = filter pathIsDirectory exclude;
       isExcluded =
         path:
         (elem path excludedFiles)
@@ -39,7 +39,7 @@ let
             ) (builtins.readDir path)
         ) (unique (if path == null then paths else [ path ] ++ paths))
       ))
-      ++ (if recursive then concatMap (path: toList path) (unique include) else unique include)
+      ++ (if recursive then concatMap toList (unique include) else unique include)
     );
 in
 umport