From bc1a7356d0afb63cd67f7c14c7e766354c7d7866 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 21 May 2024 13:41:53 +0200 Subject: build: narrow overly-broad linting exclusions I started this project using `niv`, which creates `nix/sources.nix`, which is all I really needed to exclude as it's generated by niv. Now there's generated code only in `nix/overlays`, so the rest of the files under `nix/` should be formatted by nixpkgs-fmt and analysed by statix and deadnix. --- nix/modules/default.nix | 2 +- nix/pre-commit-checks.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nix/modules/default.nix b/nix/modules/default.nix index cd17ca3..8c8499a 100644 --- a/nix/modules/default.nix +++ b/nix/modules/default.nix @@ -199,7 +199,7 @@ in users.users = optionalAttrs (cfg.user == "searchix") { searchix = { - group = cfg.group; + inherit (cfg) group; home = cfg.homeDir; isSystemUser = true; }; diff --git a/nix/pre-commit-checks.nix b/nix/pre-commit-checks.nix index eb43a4e..e3b651e 100644 --- a/nix/pre-commit-checks.nix +++ b/nix/pre-commit-checks.nix @@ -38,15 +38,15 @@ rec { statix = { enable = true; - settings.ignore = [ "nix/*" ]; + settings.ignore = [ "nix/overlays/*" ]; }; deadnix = { enable = true; - excludes = [ "nix/.*" ]; + excludes = [ "nix/overlays/*" ]; }; nixpkgs-fmt = { enable = true; - excludes = [ "nix/.*" ]; + excludes = [ "nix/overlays/*" ]; }; convco.enable = true; -- cgit 1.4.1