Merge #146

146: style: Add config for style normalisation and re-apply r=Lassulus a=cscutcher



Co-authored-by: Chris Scutcher <chris@scutcher.uk>

default.nix

@@ -16,7 +16,7 @@ let
   };
 in
 {
-  inherit types;
+  types = types;
   create = cfg: types.diskoLib.create (eval cfg).config.devices;
   createScript = cfg: pkgs: pkgs.writeScript "disko-create" ''
     #!/usr/bin/env bash

doc.nix

@@ -19,7 +19,7 @@ let
     ];
   };
   options = nixosOptionsDoc {
-    inherit (eval) options;
+    options = eval.options;
   };
   md = (runCommand "disko-options.md" { } ''
     cat >$out <<EOF

example/stand-alone/configuration.nix

@@ -1,8 +1,8 @@
-{
+{ pkgs
-  pkgs,
+, lib
-  lib,
+, ...
-  ...
+}:
-}: let
+let
   # We just import from the repository for testing here:
   disko = import ../../. {
     inherit lib;
@@ -41,7 +41,8 @@
       };
     };
   };
-in {
+in
+{
   imports = [
     (disko.config cfg)
   ];

example/with-lib.nix

@@ -1,7 +1,7 @@
 # Example to create a bios compatible gpt partition
 { disks ? [ "/dev/vdb" ], lib, ... }: {
   disk = lib.genAttrs [ (lib.head disks) ] (device: {
-    inherit device;
+    device = device;
     type = "disk";
     content = {
       type = "table";

flake.nix

@@ -57,5 +57,22 @@
           '';
         in
         nixosTests // { inherit shellcheck; });
+      formatter = forAllSystems (system:
+        let
+          pkgs = nixpkgs.legacyPackages.${system};
+        in
+        pkgs.writeShellApplication {
+          name = "normalise_nix";
+          runtimeInputs = with pkgs; [
+            nixpkgs-fmt
+            statix
+          ];
+          text = ''
+            set -o xtrace
+            nixpkgs-fmt "$@"
+            statix fix "$@"
+          '';
+        }
+      );
     };
 }

module.nix

@@ -2,7 +2,7 @@
 let
   types = import ./types {
     inherit lib;
-    inherit (config.disko) rootMountPoint;
+    rootMountPoint = config.disko.rootMountPoint;
   };
   cfg = config.disko;
 in

statix.toml

@@ -0,0 +1,4 @@
+disabled = [
+    "manual_inherit",  # Prefer `inherit types;` instead of `types = types;`
+    "manual_inherit_from",  # Prefer `inherit (eval) options;` instead of `options = eval.options`.
+]

tests/bcachefs.nix

@@ -14,11 +14,13 @@ makeDiskoTest {
   extraConfig = {
     boot.supportedFilesystems = [ "bcachefs" ];
     # disable zfs so we can support latest kernel
-    nixpkgs.overlays = [(final: super: {
+    nixpkgs.overlays = [
+      (final: super: {
         zfs = super.zfs.overrideAttrs (_: {
           meta.platforms = [ ];
         });
-    })];
+      })
+    ];
     boot.kernelPackages = pkgs.lib.mkForce (pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux-bcachefs));
   };
 }

tests/default.nix

@@ -3,12 +3,14 @@
 , pkgs ? (import <nixpkgs> { })
 }@args:
 let
-  inherit (pkgs) lib;
+  lib = pkgs.lib;
-  inherit ((pkgs.callPackage ./lib.nix { inherit makeTest eval-config; })) makeDiskoTest;
+  makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest;
 
-  evalTest = name: configFile: let
+  evalTest = name: configFile:
+    let
       disko-config = import configFile;
-  in {
+    in
+    {
       "${name}-tsp-create" = pkgs.writeScript "create" ((pkgs.callPackage ../. { }).create disko-config);
       "${name}-tsp-mount" = pkgs.writeScript "mount" ((pkgs.callPackage ../. { }).mount disko-config);
     };

tests/lib.nix

@@ -17,7 +17,7 @@
     , testBoot ? true # if we actually want to test booting or just create/mount
     }:
     let
-      inherit (pkgs) lib;
+      lib = pkgs.lib;
       makeTest' = args:
         makeTest args {
           inherit pkgs;

types/default.nix

@@ -189,7 +189,7 @@ rec {
         internal = true;
         readOnly = true;
         type = lib.types.functionTo diskoLib.jsonType;
-        inherit (attrs) default;
+        default = attrs.default;
         description = "Mount script";
       };
 

types/lvm_vg.nix

@@ -42,7 +42,7 @@
             vgchange -a y
             ${lib.concatMapStrings (x: x.dev or "") (lib.attrValues lvMounts)}
           '';
-          inherit (lvMounts) fs;
+          fs = lvMounts.fs;
         };
     };
     _config = lib.mkOption {

types/nodev.nix

@@ -54,8 +54,8 @@
       readOnly = true;
       default = [{
         fileSystems.${config.mountpoint} = {
-          inherit (config) device;
+          device = config.device;
-          inherit (config) fsType;
+          fsType = config.fsType;
           options = config.mountOptions;
         };
       }];

types/swap.nix

@@ -40,7 +40,7 @@
       default = dev: [{
         swapDevices = [{
           device = dev;
-          inherit (config) randomEncryption;
+          randomEncryption = config.randomEncryption;
         }];
       }];
       description = "NixOS configuration";