style: Fix treefmt statix/deadnix lint issues

Author: PetarKirov

flake.nix

@@ -46,10 +46,12 @@
     };
     lib-extras = {
       url = "github:aldoborrero/lib-extras/v0.2.2";
-      inputs.devshell.follows = "devshell";
-      inputs.flake-parts.follows = "flake-parts";
-      inputs.nixpkgs.follows = "nixpkgs";
-      inputs.treefmt-nix.follows = "treefmt-nix";
+      inputs = {
+        devshell.follows = "devshell";
+        flake-parts.follows = "flake-parts";
+        nixpkgs.follows = "nixpkgs";
+        treefmt-nix.follows = "treefmt-nix";
+      };
     };
   };
 

modules/geth/default.nix

@@ -58,14 +58,14 @@ in {
     environment = lib.mapAttrs' (gethName: cfg:
       lib.nameValuePair "etc" {
         "ethereum/geth-${gethName}-args" = let
-          argsFromFile = cfg.argsFromFile;
+          inherit (cfg) argsFromFile;
         in
           lib.mkIf argsFromFile.enable {
             source = builtins.toFile "geth-${gethName}-args" ''
               ARGS="${serviceArgs.${gethName}.scriptArgs}"
             '';
-            group = argsFromFile.group;
-            mode = argsFromFile.mode;
+            inherit (argsFromFile) group;
+            inherit (argsFromFile) mode;
           };
       })
     eachGeth;

modules/geth/service-args.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
+{lib, ...}: let
   modulesLib = import ../lib.nix lib;
 
   inherit (lib.lists) findFirst;

modules/nethermind/default.nix

@@ -50,14 +50,14 @@ in {
     environment = lib.mapAttrs' (nethermindName: cfg:
       lib.nameValuePair "etc" {
         "ethereum/nethermind-${nethermindName}-args" = let
-          argsFromFile = cfg.argsFromFile;
+          inherit (cfg) argsFromFile;
         in
           lib.mkIf argsFromFile.enable {
             source = builtins.toFile "nethermind-${nethermindName}-args" ''
               ARGS="${serviceArgs.${nethermindName}.scriptArgs}"
             '';
-            group = argsFromFile.group;
-            mode = argsFromFile.mode;
+            inherit (argsFromFile) group;
+            inherit (argsFromFile) mode;
           };
       })
     eachNethermind;

modules/nethermind/service-args.nix

@@ -1,8 +1,4 @@
-{
-  lib,
-  pkgs,
-  ...
-}: let
+{lib, ...}: let
   modulesLib = import ../lib.nix lib;
   inherit (builtins) isBool isList toString;
   inherit (lib) boolToString concatStringsSep findFirst hasPrefix;

modules/nimbus-eth2/default.nix

@@ -8,7 +8,7 @@
 
   serviceArgs =
     lib.mapAttrs (
-      beaconName: let
+      _beaconName: let
         serviceName = "nimbus-eth2";
       in
         cfg: ((import ./service-args.nix {inherit lib pkgs;}).argsCreate serviceName cfg)
@@ -30,7 +30,7 @@ in {
     assertions =
       mapAttrsToList
       (
-        name: cfg: {
+        _name: cfg: {
           assertion = cfg.args.payload-builder.enable -> cfg.args.payload-builder.url != null;
           message = "services.ethereum.nimbus-eth2.payload-builder must have `url` specified, if enabled";
         }
@@ -56,14 +56,14 @@ in {
     environment = lib.mapAttrs' (beaconName: cfg:
       lib.nameValuePair "etc" {
         "ethereum/nimbus-${beaconName}-args" = let
-          argsFromFile = cfg.argsFromFile;
+          inherit (cfg) argsFromFile;
         in
           lib.mkIf argsFromFile.enable {
             source = builtins.toFile "nimbus-${beaconName}-args" ''
               ARGS="${serviceArgs.${beaconName}.beaconNodeArgs}"
             '';
-            group = argsFromFile.group;
-            mode = argsFromFile.mode;
+            inherit (argsFromFile) group;
+            inherit (argsFromFile) mode;
           };
       })
     eachBeacon;