useless_parens

modules/nixos/hardware/raspberry-pi/default.nix

@@ -15,7 +15,7 @@ let
 
   # installs raspberry's firmware independent of the nixos generations
   # sometimes referred to as "boot code"
-  raspberryPiFirmware = (
+  raspberryPiFirmware =
     {
       pkgs,
       firmware,
@@ -33,10 +33,9 @@ let
 
         inherit firmware configTxt;
       };
-    }
-  );
+    };
 
-  kernelbootGenBuilder = (
+  kernelbootGenBuilder =
     {
       pkgs,
       deviceTreeInstaller,
@@ -53,10 +52,9 @@ let
 
         installDeviceTree = deviceTreeInstaller;
       };
-    }
-  );
+    };
 
-  deviceTree = (
+  deviceTree =
     {
       pkgs,
       firmware,
@@ -73,8 +71,7 @@ let
 
         inherit firmware;
       };
-    }
-  );
+    };
 
   mkBootloader =
     pkgs:
@@ -113,7 +110,7 @@ let
 
     };
 
-  bootloader = (
+  bootloader =
     {
       pkgs,
       nixosGenerationsDir,
@@ -136,28 +133,25 @@ let
         # NixOS-generations -dependent
         inherit nixosGenerationsDir nixosGenBuilder;
       };
-    }
-  );
+    };
 
   # Builders used to write during system activation
 
   ubootBuilder = import ./uboot-builder.nix {
     inherit pkgs;
-    ubootPackage = (
-      if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4
-    );
+    ubootPackage =
+      if (cfg.variant == "5") then pkgs.${namespace}.uboot-pi5 else pkgs.${namespace}.uboot-pi4;
     firmwareBuilder = firmwarePopulateCmd;
     extlinuxConfBuilder = config.boot.loader.generic-extlinux-compatible.populateCmd;
   };
 
   uefiBuilder = import ./uefi-builder.nix {
     inherit pkgs;
-    uefiPackage = (
+    uefiPackage =
       if (cfg.variant == "5") then
         pkgs.${namespace}.uefi-rpi5
       else
-        pkgs.${namespace}.edk2.override { MODEL = "4"; }
-    );
+        pkgs.${namespace}.edk2.override { MODEL = "4"; };
     firmwareBuilder = firmwarePopulateCmd;
   };
 
@@ -297,14 +291,16 @@ in
           enable = lib.mkDefault (if cfg.bootType == "uefi" then false else true);
           useGenerationDeviceTree = lib.mkOverride 60 (if cfg.bootType == "uefi" then false else true);
         };
-        systemd-boot.enable = (if cfg.bootType == "uefi" then true else false);
-        systemd-boot.extraInstallCommands =
-          let
-            bootloaderInstaller = (builder."${cfg.bootType}");
-          in
-          ''
-            ${bootloaderInstaller} -f /boot/firmware -b /boot -c
-          '';
+        systemd-boot = {
+          enable = if cfg.bootType == "uefi" then true else false;
+          extraInstallCommands =
+            let
+              bootloaderInstaller = builder."${cfg.bootType}";
+            in
+            ''
+              ${bootloaderInstaller} -f /boot/firmware -b /boot -c
+            '';
+        };
         grub.enable = lib.mkForce false;
       };
     };
@@ -350,14 +346,13 @@ in
             };
             kernel = lib.mkIf (cfg.bootType == "kernel" || cfg.bootType == "uboot") {
               enable = true;
-              value = (
+              value =
                 if cfg.bootType == "uboot" then
                   "u-boot.bin"
                 else if cfg.bootType == "kernel" then
                   "kernel.img"
                 else
-                  ""
-              );
+                  "";
             };
           };
         };