treewide: Introduce deadnix

TLATER · Nov 23, 2023 · 9da8955 · 9da8955
1 parent 8656b5c
commit 9da8955
Show file tree

Hide file tree

Showing 19 changed files with 146 additions and 47 deletions.
diff --git a/checks/alejandra.nix b/checks/alejandra.nix
@@ -3,21 +3,19 @@
   mkTest,
   lib,
   alejandra,
+  generatedFiles,
 }: let
+  inherit (lib) concatStringsSep;
   inherit (lib.sources) sourceFilesBySuffices;
+  excludes = concatStringsSep " " (map (f: "--exclude ./${f}") generatedFiles);
 in
   mkTest {
     name = "lint-alejandra";
     src = sourceFilesBySuffices self [".nix"];
     checkInputs = [alejandra];
     checkPhase = ''
       mkdir -p $out
-      alejandra --check \
-          --exclude ./home-config/dotfiles/emacs.d/share/templates/ \
-          --exclude ./pkgs/_sources/ \
-          --exclude ./nixos-config/yui/hardware-configuration.nix \
-          --exclude ./nixos-config/ren/hardware-configuration.nix \
-          . \
-      | tee $out/test.log
+      echo alejandra --check ${excludes} . | tee $out/test.log
+      alejandra --check ${excludes} . | tee $out/test.log
     '';
   }
diff --git a/checks/deadnix.nix b/checks/deadnix.nix
@@ -0,0 +1,24 @@
+{
+  pkgs,
+  self,
+  mkTest,
+  lib,
+  flake-inputs,
+  generatedFiles,
+}: let
+  inherit (lib) concatStringsSep;
+  inherit (lib.sources) sourceFilesBySuffices;
+
+  deadnix = flake-inputs.deadnix.packages.${pkgs.system}.default;
+
+  excludes = "--exclude ${concatStringsSep " " (map (f: "./${f}") generatedFiles)}";
+in
+  mkTest {
+    name = "lint-deadnix";
+    src = sourceFilesBySuffices self [".nix"];
+    checkInputs = [deadnix];
+    checkPhase = ''
+      mkdir -p $out
+      deadnix --fail ${excludes} | tee $out/test.log
+    '';
+  }
diff --git a/checks/default.nix b/checks/default.nix
@@ -4,6 +4,14 @@
   flake-inputs,
 }: let
   inherit (lib) callPackageWith;
+
+  generatedFiles = [
+    "home-config/dotfiles/emacs.d/share/templates"
+    "pkgs/_sources"
+    "nixos-config/yui/hardware-configuration.nix"
+    "nixos-config/ren/hardware-configuration.nix"
+  ];
+
   mkTest = test:
     pkgs.stdenv.mkDerivation ({
         dontPatch = true;
@@ -13,9 +21,10 @@
         doCheck = true;
       }
       // test);
+
   callPackage = callPackageWith (pkgs
     // {
-      inherit flake-inputs mkTest;
+      inherit flake-inputs mkTest generatedFiles;
       # Work around `self` technically being a store path when
       # evaluated as a flake - `builtins.filter` can otherwise not be
       # called on it.
@@ -27,5 +36,6 @@
 in {
   # Linters and formatters
   alejandra = callPackage ./alejandra.nix {};
+  deadnix = callPackage ./deadnix.nix {};
   shellcheck = callPackage ./shellcheck.nix {};
 }
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -57,6 +57,7 @@
       url = "github:berberman/nvfetcher";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    deadnix.url = "github:astro/deadnix";
   };
 
   outputs = {

diff --git a/home-config/config/default.nix b/home-config/config/default.nix
@@ -1,8 +1,4 @@
 {
-  config,
-  lib,
-  ...
-}: {
   imports = [
     ./options.nix
     ./non-nixos.nix

diff --git a/home-config/config/desktop/default.nix b/home-config/config/desktop/default.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

diff --git a/home-config/config/desktop/dunst.nix b/home-config/config/desktop/dunst.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   screenHeight = 1080;

diff --git a/home-config/config/options.nix b/home-config/config/options.nix
@@ -1,10 +1,5 @@
-{
-  config,
-  lib,
-  ...
-}: let
+{lib, ...}: let
   inherit (lib) mkEnableOption;
-  cfg = config.custom;
 in {
   options.custom = {
     desktop-environment = mkEnableOption "Set up a stumpwm-based desktop environment";

diff --git a/home-config/config/tty-applications/default.nix b/home-config/config/tty-applications/default.nix
@@ -1,8 +1,6 @@
 {
   config,
-  lib,
   pkgs,
-  flake-inputs,
   ...
 }: {
   imports = [

diff --git a/home-config/config/tty-applications/emacs.nix b/home-config/config/tty-applications/emacs.nix
@@ -1,5 +1,4 @@
 {
-  config,
   pkgs,
   flake-inputs,
   ...

diff --git a/home-config/default.nix b/home-config/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pkgs,
   flake-inputs,
   ...
 }: {

diff --git a/home-modules/firefox-webapp.nix b/home-modules/firefox-webapp.nix
@@ -1,5 +1,4 @@
 {
-  pkgs,
   config,
   lib,
   ...

diff --git a/nixos-config/default.nix b/nixos-config/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  config,
   pkgs,
   flake-inputs,
   ...

diff --git a/nixos-config/ren/default.nix b/nixos-config/ren/default.nix
@@ -1,8 +1,4 @@
-{
-  lib,
-  flake-inputs,
-  ...
-}: {
+{flake-inputs, ...}: {
   imports = [
     flake-inputs.impermanence.nixosModules.impermanence
     flake-inputs.disko.nixosModules.disko

diff --git a/nixos-config/yui/nvidia.nix b/nixos-config/yui/nvidia.nix
@@ -64,7 +64,7 @@
   # Downgrade to 0.5.0 because 1.2.2 doesn't currently work on nvidia
   # (for me)
   xdg.portal.extraPortals = lib.mkOverride 49 [
-    (pkgs.xdg-desktop-portal-hyprland.overrideAttrs (old: {
+    (pkgs.xdg-desktop-portal-hyprland.overrideAttrs (_old: {
       version = "0.5.0";
       src = pkgs.fetchFromGitHub {
         owner = "hyprwm";

diff --git a/pkgs/applications/deepfilternet.nix b/pkgs/applications/deepfilternet.nix
@@ -21,7 +21,7 @@
       rustc = toolchain;
     };
 
-  hdf5-12 = hdf5.overrideAttrs (old: {
+  hdf5-12 = hdf5.overrideAttrs (_old: {
     version = "1.12.2";
 
     src = fetchurl {
-Original file line number
+Diff line change
@@ -1,5 +1,4 @@
     {
-      pkgs,
       config,
       lib,
       ...
@@ Expand Down @@