From 9f931223832ce08efa5eba99f474d5e024377f80 Mon Sep 17 00:00:00 2001 From: guangtao Date: Mon, 20 Nov 2023 00:43:43 -0800 Subject: [PATCH] chore: run deadnix --- examples/overlays/__fixture/test1.nix | 2 +- examples/overlays/__fixture/test2.nix | 2 +- examples/packages/default.nix | 6 +----- justfile | 5 +++++ src/lib/addLoadToPopsFilterBySrc.nix | 2 +- src/lib/attrsets/filterDerivations.nix | 2 +- src/lib/types.nix | 6 +----- src/pops/_exportsOmnibusProfiles.nix | 2 +- src/pops/configs.nix | 2 +- src/pops/load.nix | 5 +---- src/pops/packages.nix | 2 +- templates/hivebus/nix/src/pops/hosts.nix | 1 - templates/nixos/nix/src/pops/hosts.nix | 1 - tests/microvms/__fixture/example.nix | 2 -- units/nixos/darwinProfiles/presets/bootstrap.nix | 1 - units/nixos/homeProfiles/presets/navi.nix | 2 +- 16 files changed, 16 insertions(+), 27 deletions(-) create mode 100644 justfile diff --git a/examples/overlays/__fixture/test1.nix b/examples/overlays/__fixture/test1.nix index 550cc5d..ff9ccb9 100644 --- a/examples/overlays/__fixture/test1.nix +++ b/examples/overlays/__fixture/test1.nix @@ -4,5 +4,5 @@ _: -final: prev: +_final: _prev: { } diff --git a/examples/overlays/__fixture/test2.nix b/examples/overlays/__fixture/test2.nix index 81fbc99..5313c6b 100644 --- a/examples/overlays/__fixture/test2.nix +++ b/examples/overlays/__fixture/test2.nix @@ -2,4 +2,4 @@ # # SPDX-License-Identifier: MIT -{ inputs }: final: prev: { } +{ inputs }: _final: _prev: { } diff --git a/examples/packages/default.nix b/examples/packages/default.nix index 97c2a23..5a2460e 100644 --- a/examples/packages/default.nix +++ b/examples/packages/default.nix @@ -3,11 +3,7 @@ # SPDX-License-Identifier: MIT # [[file:../../docs/org/pops-packages.org::*Example][Example:1]] -{ - omnibus, - inputs, - self, -}: +{ omnibus, inputs }: omnibus.pops.packages { src = ./__fixture; inputs = { diff --git a/justfile b/justfile new file mode 100644 index 0000000..9dfddff --- /dev/null +++ b/justfile @@ -0,0 +1,5 @@ +deadnix: + deadnix . --edit --exclude ./units/std/blockTypes/* + +justfmt: + just --fmt --unstable diff --git a/src/lib/addLoadToPopsFilterBySrc.nix b/src/lib/addLoadToPopsFilterBySrc.nix index b997c5b..d71d114 100644 --- a/src/lib/addLoadToPopsFilterBySrc.nix +++ b/src/lib/addLoadToPopsFilterBySrc.nix @@ -9,7 +9,7 @@ let getDirs = host: lib.attrNames (lib.readDir (dir + "/${host}")); processPops = name: - lib.filterAttrs (n: v: v != { }) ( + lib.filterAttrs (_n: v: v != { }) ( lib.mapAttrs ( n: v: diff --git a/src/lib/attrsets/filterDerivations.nix b/src/lib/attrsets/filterDerivations.nix index 3c225fa..7465f22 100644 --- a/src/lib/attrsets/filterDerivations.nix +++ b/src/lib/attrsets/filterDerivations.nix @@ -4,5 +4,5 @@ { super, lib }: super.filterAttrsOnlyRecursive ( - n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false + _n: attrs: lib.isDerivation attrs || attrs.recurseForDerivations or false ) diff --git a/src/lib/types.nix b/src/lib/types.nix index b101ee9..2f4404f 100644 --- a/src/lib/types.nix +++ b/src/lib/types.nix @@ -2,11 +2,7 @@ # # SPDX-License-Identifier: MIT -{ - lib, - yants, - self, -}: +{ yants, self }: with yants; { a = struct "test" { name = string; }; b = either self.a (struct { age = int; }); diff --git a/src/pops/_exportsOmnibusProfiles.nix b/src/pops/_exportsOmnibusProfiles.nix index ca07c56..5d83eca 100644 --- a/src/pops/_exportsOmnibusProfiles.nix +++ b/src/pops/_exportsOmnibusProfiles.nix @@ -4,7 +4,7 @@ { lib }: self: -lib.mapAttrs (n: v: (if lib.isAttrs v then v else v { })) self +lib.mapAttrs (_n: v: (if lib.isAttrs v then v else v { })) self # (self.addLoadExtender { # load = { # transformer = [ diff --git a/src/pops/configs.nix b/src/pops/configs.nix index cf1b544..913db4b 100644 --- a/src/pops/configs.nix +++ b/src/pops/configs.nix @@ -21,7 +21,7 @@ let applyRecursive = mkFunc: layoutData: lib.mapAttrsRecursiveCond (as: !(lib.isAttrs as && as ? data)) # Condition to check - (n: v: mkFunc v) # Function to apply + (_n: v: mkFunc v) # Function to apply layoutData; # Function to process each layout diff --git a/src/pops/load.nix b/src/pops/load.nix index 642836d..1dde98c 100644 --- a/src/pops/load.nix +++ b/src/pops/load.nix @@ -14,10 +14,7 @@ load: (flops.haumea.pops.default.setInit ( recursiveMerge' [ { - loader = with haumea; [ - (matchers.nix loaders.scoped) - (matchers.nix loaders.default) - ]; + loader = with haumea; [ (matchers.nix loaders.default) ]; inputs = root.lib.loaderInputs; } load diff --git a/src/pops/packages.nix b/src/pops/packages.nix index 1de33e0..3b21bd0 100644 --- a/src/pops/packages.nix +++ b/src/pops/packages.nix @@ -28,7 +28,7 @@ makeScope newScope ( self: _super: { exports = { overlay = - final: prev: + final: _prev: (self.layouts.self.addLoadExtender { load = { inputs.inputs.nixpkgs = final; diff --git a/templates/hivebus/nix/src/pops/hosts.nix b/templates/hivebus/nix/src/pops/hosts.nix index e00db5f..c89844e 100644 --- a/templates/hivebus/nix/src/pops/hosts.nix +++ b/templates/hivebus/nix/src/pops/hosts.nix @@ -6,7 +6,6 @@ lib, super, omnibus, - root, projectDir, }: let diff --git a/templates/nixos/nix/src/pops/hosts.nix b/templates/nixos/nix/src/pops/hosts.nix index e00db5f..c89844e 100644 --- a/templates/nixos/nix/src/pops/hosts.nix +++ b/templates/nixos/nix/src/pops/hosts.nix @@ -6,7 +6,6 @@ lib, super, omnibus, - root, projectDir, }: let diff --git a/tests/microvms/__fixture/example.nix b/tests/microvms/__fixture/example.nix index e4fa0c2..f3dc1b4 100644 --- a/tests/microvms/__fixture/example.nix +++ b/tests/microvms/__fixture/example.nix @@ -6,11 +6,9 @@ config, lib, pkgs, - inputs, ... }: let - inherit (inputs) nixpkgs; inherit (pkgs) system; in { diff --git a/units/nixos/darwinProfiles/presets/bootstrap.nix b/units/nixos/darwinProfiles/presets/bootstrap.nix index 3e99c66..6f5ee28 100644 --- a/units/nixos/darwinProfiles/presets/bootstrap.nix +++ b/units/nixos/darwinProfiles/presets/bootstrap.nix @@ -4,7 +4,6 @@ { omnibus, - pkgs, lib, config, }: diff --git a/units/nixos/homeProfiles/presets/navi.nix b/units/nixos/homeProfiles/presets/navi.nix index 548e820..c82f8c4 100644 --- a/units/nixos/homeProfiles/presets/navi.nix +++ b/units/nixos/homeProfiles/presets/navi.nix @@ -31,7 +31,7 @@ let "sunos" (if isLinux then "osx" else "linux") ( - root: path: type: + _root: path: _type: if (builtins.match "[^/]*(rpm|yum|apt).*.cheat" (builtins.baseNameOf path)) == null then