From 4ba81813190c86288f58b82e55868ce4d5f55789 Mon Sep 17 00:00:00 2001
From: Chris Scutcher <chris@scutcher.uk>
Date: Tue, 7 Feb 2023 15:37:12 +0000
Subject: [PATCH] style: Disable `inherit` pattern check in statix

As discussed in [this
comment](https://github.com/nix-community/disko/pull/143#discussion_r1097912402),
as a blanket rule converting everything possible to `inherit` like
statements can hurt readability.

Add config file for statix to disable these checks and fixes, then rerun
the autofix with these options.
---
 default.nix          | 2 +-
 doc.nix              | 2 +-
 example/with-lib.nix | 2 +-
 module.nix           | 2 +-
 statix.toml          | 4 ++++
 tests/default.nix    | 4 ++--
 tests/lib.nix        | 2 +-
 types/default.nix    | 2 +-
 types/lvm_vg.nix     | 2 +-
 types/nodev.nix      | 4 ++--
 types/swap.nix       | 2 +-
 11 files changed, 16 insertions(+), 12 deletions(-)
 create mode 100644 statix.toml

diff --git a/default.nix b/default.nix
index c02a220..33473bf 100644
--- a/default.nix
+++ b/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
diff --git a/doc.nix b/doc.nix
index 63ad9e2..67b17bd 100644
--- a/doc.nix
+++ b/doc.nix
@@ -19,7 +19,7 @@ let
     ];
   };
   options = nixosOptionsDoc {
-    inherit (eval) options;
+    options = eval.options;
   };
   md = (runCommand "disko-options.md" { } ''
     cat >$out <<EOF
diff --git a/example/with-lib.nix b/example/with-lib.nix
index 0afb0a8..ce0b93d 100644
--- a/example/with-lib.nix
+++ b/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";
diff --git a/module.nix b/module.nix
index b68cc42..820d985 100644
--- a/module.nix
+++ b/module.nix
@@ -2,7 +2,7 @@
 let
   types = import ./types {
     inherit lib;
-    inherit (config.disko) rootMountPoint;
+    rootMountPoint = config.disko.rootMountPoint;
   };
   cfg = config.disko;
 in
diff --git a/statix.toml b/statix.toml
new file mode 100644
index 0000000..c46ef0a
--- /dev/null
+++ b/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`.
+]
diff --git a/tests/default.nix b/tests/default.nix
index 3c46ad7..3706206 100644
--- a/tests/default.nix
+++ b/tests/default.nix
@@ -3,8 +3,8 @@
 , pkgs ? (import <nixpkgs> { })
 }@args:
 let
-  inherit (pkgs) lib;
-  inherit ((pkgs.callPackage ./lib.nix { inherit makeTest eval-config; })) makeDiskoTest;
+  lib = pkgs.lib;
+  makeDiskoTest = (pkgs.callPackage ./lib.nix { inherit makeTest eval-config; }).makeDiskoTest;
 
   evalTest = name: configFile: let
     disko-config = import configFile;
diff --git a/tests/lib.nix b/tests/lib.nix
index b4d3f37..1ab8934 100644
--- a/tests/lib.nix
+++ b/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;
diff --git a/types/default.nix b/types/default.nix
index 403b861..9614505 100644
--- a/types/default.nix
+++ b/types/default.nix
@@ -187,7 +187,7 @@ rec {
         internal = true;
         readOnly = true;
         type = lib.types.functionTo diskoLib.jsonType;
-        inherit (attrs) default;
+        default = attrs.default;
         description = "Mount script";
       };
 
diff --git a/types/lvm_vg.nix b/types/lvm_vg.nix
index 9b52936..ba313e1 100644
--- a/types/lvm_vg.nix
+++ b/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 {
diff --git a/types/nodev.nix b/types/nodev.nix
index 9b5fcea..2700ab7 100644
--- a/types/nodev.nix
+++ b/types/nodev.nix
@@ -54,8 +54,8 @@
       readOnly = true;
       default = [{
         fileSystems.${config.mountpoint} = {
-          inherit (config) device;
-          inherit (config) fsType;
+          device = config.device;
+          fsType = config.fsType;
           options = config.mountOptions;
         };
       }];
diff --git a/types/swap.nix b/types/swap.nix
index 90c3e22..60a7aff 100644
--- a/types/swap.nix
+++ b/types/swap.nix
@@ -40,7 +40,7 @@
       default = dev: [{
         swapDevices = [{
           device = dev;
-          inherit (config) randomEncryption;
+          randomEncryption = config.randomEncryption;
         }];
       }];
       description = "NixOS configuration";