From cdcd180527f03a994182f1c28261aca84edd83b2 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Tue, 24 Jun 2025 21:42:12 +0800 Subject: [PATCH] module(just): Add dead-nix to check unused nix code --- .justfile | 3 +++ flake/home.nix | 4 ++-- home/alice/configurations/Cape/default.nix | 1 - home/david/configurations/Akun/default.nix | 1 - home/david/configurations/Akun/niri.nix | 2 +- home/david/configurations/Tytonidae/default.nix | 2 -- home/david/configurations/Tytonidae/niri.nix | 2 +- home/david/modules/programs/niri/default.nix | 4 ++-- home/modules/programs/helix/default.nix | 1 - nixos/configurations/Tytonidae/default.nix | 1 - nixos/configurations/Tytonidae/gui.nix | 2 +- nixos/modules/gui/cosmic.nix | 1 - nixos/modules/programs/default.nix | 6 +----- nixos/modules/programs/nix-ld.nix | 1 - nixos/modules/sops.nix | 6 +----- overlays/additions/OuterWildsTextAdventure.nix | 2 +- overlays/additions/TrackersListCollection.nix | 2 +- overlays/additions/editor-runtime.nix | 2 +- overlays/modifications/QQ.nix | 2 +- overlays/modifications/cliphist.nix | 2 +- overlays/modifications/dae.nix | 2 +- overlays/modifications/fix-hurl.nix | 2 +- overlays/modifications/helix.nix | 2 +- overlays/modifications/juicity.nix | 2 +- overlays/modifications/radicle-explorer.nix | 2 +- overlays/modifications/spotifyx.nix | 2 +- overlays/modifications/wshowkeys.nix | 2 +- pkgs/cliphist.nix | 2 +- pkgs/noto-sans-cjk.nix | 2 +- pkgs/noto-serif-cjk.nix | 2 +- pkgs/spotifyx.nix | 2 +- pkgs/wshowkeys-mao.nix | 2 +- templates/cxx/flake.nix | 2 -- templates/cxxWithXmake/flake.nix | 1 - templates/python/flake.nix | 1 - templates/rust/flake.nix | 2 +- 36 files changed, 30 insertions(+), 47 deletions(-) diff --git a/.justfile b/.justfile index 8ad8ffd..e69a1f8 100755 --- a/.justfile +++ b/.justfile @@ -37,6 +37,9 @@ buildHome host=DEFAULT_HOST $USER=DEFAULT_USER: @echo HOST: {{ host }} nh home build -b backup {{ if host != DEFAULT_HOST { "-c \"" + USER + "@" + host + "\"" } else { "" } }} {{ FLAKE_HOME }} +deadNix: + nix run github:astro/deadnix -- . --exclude ./pkgs/_sources/generated.nix ./nixos/configurations/{Akun,Tytonidae,Cape}/hardware-configuration.nix + alias s := switch alias u := update alias d := deploy diff --git a/flake/home.nix b/flake/home.nix index a4a5aff..50e7a26 100644 --- a/flake/home.nix +++ b/flake/home.nix @@ -10,9 +10,9 @@ ( (rootPath + "/home") |> builtins.readDir - |> lib.filterAttrs (key: value: value == "directory") + |> lib.filterAttrs (_key: value: value == "directory") |> lib.filterAttrs ( - key: value: + key: _value: !builtins.elem key [ "modules" "extra" diff --git a/home/alice/configurations/Cape/default.nix b/home/alice/configurations/Cape/default.nix index d42bd6b..244289b 100644 --- a/home/alice/configurations/Cape/default.nix +++ b/home/alice/configurations/Cape/default.nix @@ -1,7 +1,6 @@ { pkgs, unixName, - config, ... }: { youthlic = { diff --git a/home/david/configurations/Akun/default.nix b/home/david/configurations/Akun/default.nix index 9f342a3..308530f 100644 --- a/home/david/configurations/Akun/default.nix +++ b/home/david/configurations/Akun/default.nix @@ -2,7 +2,6 @@ pkgs, unixName, config, - rootPath, ... }: { imports = [ diff --git a/home/david/configurations/Akun/niri.nix b/home/david/configurations/Akun/niri.nix index 8d149a6..ccd2a2d 100644 --- a/home/david/configurations/Akun/niri.nix +++ b/home/david/configurations/Akun/niri.nix @@ -1,5 +1,5 @@ {inputs, ...}: let - inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; + inherit (inputs.niri-flake.lib.kdl) node leaf flag; in { david.programs.niri = { extraConfig = let diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 296217f..aa9aa6b 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -1,8 +1,6 @@ { pkgs, config, - rootPath, - inputs, unixName, ... }: { diff --git a/home/david/configurations/Tytonidae/niri.nix b/home/david/configurations/Tytonidae/niri.nix index cab1141..1097e49 100644 --- a/home/david/configurations/Tytonidae/niri.nix +++ b/home/david/configurations/Tytonidae/niri.nix @@ -1,5 +1,5 @@ {inputs, ...}: let - inherit (inputs.niri-flake.lib.kdl) node leaf plain flag; + inherit (inputs.niri-flake.lib.kdl) node leaf flag; in { david.programs.niri = { extraConfig = let diff --git a/home/david/modules/programs/niri/default.nix b/home/david/modules/programs/niri/default.nix index a1611d7..e19ef23 100644 --- a/home/david/modules/programs/niri/default.nix +++ b/home/david/modules/programs/niri/default.nix @@ -1,8 +1,8 @@ { config, lib, - pkgs, inputs, + pkgs, ... } @ args: let cfg = config.david.programs.niri; @@ -23,7 +23,7 @@ in { lib.mkIf cfg.enable { youthlic.programs.niri = { config = - (lib.toList (import ./config.nix args)) + (lib.toList (import ./config.nix (args // {inherit pkgs;}))) ++ (lib.toList cfg.extraConfig); }; david.programs.wluma.enable = true; diff --git a/home/modules/programs/helix/default.nix b/home/modules/programs/helix/default.nix index ed41aef..0389ba7 100644 --- a/home/modules/programs/helix/default.nix +++ b/home/modules/programs/helix/default.nix @@ -2,7 +2,6 @@ lib, pkgs, config, - outputs, ... }: { options = { diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index b728f54..d0e5a4c 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -2,7 +2,6 @@ lib, pkgs, inputs, - config, ... }: { imports = diff --git a/nixos/configurations/Tytonidae/gui.nix b/nixos/configurations/Tytonidae/gui.nix index 91d916c..bbafc39 100644 --- a/nixos/configurations/Tytonidae/gui.nix +++ b/nixos/configurations/Tytonidae/gui.nix @@ -1,4 +1,4 @@ -{pkgs, ...}: let +{...}: let extraConfig = '' output "DP-3" { mode "2560x1440@169.900" diff --git a/nixos/modules/gui/cosmic.nix b/nixos/modules/gui/cosmic.nix index 40d616a..4da6b65 100644 --- a/nixos/modules/gui/cosmic.nix +++ b/nixos/modules/gui/cosmic.nix @@ -1,7 +1,6 @@ { config, lib, - pkgs, ... }: let cfg = config.youthlic.gui; diff --git a/nixos/modules/programs/default.nix b/nixos/modules/programs/default.nix index da48a0e..a69c343 100644 --- a/nixos/modules/programs/default.nix +++ b/nixos/modules/programs/default.nix @@ -1,8 +1,4 @@ -{ - config, - lib, - ... -}: { +{...}: { imports = [ ./transfer-sh.nix ./rustypaste diff --git a/nixos/modules/programs/nix-ld.nix b/nixos/modules/programs/nix-ld.nix index 70594dd..bae07d7 100644 --- a/nixos/modules/programs/nix-ld.nix +++ b/nixos/modules/programs/nix-ld.nix @@ -1,5 +1,4 @@ { - pkgs, config, lib, ... diff --git a/nixos/modules/sops.nix b/nixos/modules/sops.nix index 4b78e6c..6ec8e0b 100644 --- a/nixos/modules/sops.nix +++ b/nixos/modules/sops.nix @@ -1,8 +1,4 @@ -{ - rootPath, - config, - ... -}: { +{rootPath, ...}: { config = { sops.defaultSopsFile = rootPath + "/secrets/general.yaml"; sops.age = { diff --git a/overlays/additions/OuterWildsTextAdventure.nix b/overlays/additions/OuterWildsTextAdventure.nix index 8ab28c7..b8a687f 100644 --- a/overlays/additions/OuterWildsTextAdventure.nix +++ b/overlays/additions/OuterWildsTextAdventure.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages.${system}) OuterWildsTextAdventure; diff --git a/overlays/additions/TrackersListCollection.nix b/overlays/additions/TrackersListCollection.nix index e7ca1cf..17da85c 100644 --- a/overlays/additions/TrackersListCollection.nix +++ b/overlays/additions/TrackersListCollection.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages."${system}") TrackersListCollection; diff --git a/overlays/additions/editor-runtime.nix b/overlays/additions/editor-runtime.nix index c23213a..bfba19f 100644 --- a/overlays/additions/editor-runtime.nix +++ b/overlays/additions/editor-runtime.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages.${system}) editor-runtime; diff --git a/overlays/modifications/QQ.nix b/overlays/modifications/QQ.nix index 823e01e..16d5d7b 100644 --- a/overlays/modifications/QQ.nix +++ b/overlays/modifications/QQ.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { qq = outputs.packages."${system}".QQ; diff --git a/overlays/modifications/cliphist.nix b/overlays/modifications/cliphist.nix index a123457..85d18c3 100644 --- a/overlays/modifications/cliphist.nix +++ b/overlays/modifications/cliphist.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (outputs.packages."${system}") cliphist; diff --git a/overlays/modifications/dae.nix b/overlays/modifications/dae.nix index 3ee2db2..8437b0b 100644 --- a/overlays/modifications/dae.nix +++ b/overlays/modifications/dae.nix @@ -1,4 +1,4 @@ -{inputs, ...}: final: prev: let +{inputs, ...}: final: _prev: let inherit (final) stdenv; inherit (stdenv.hostPlatform) system; in { diff --git a/overlays/modifications/fix-hurl.nix b/overlays/modifications/fix-hurl.nix index b515d50..62ffaea 100644 --- a/overlays/modifications/fix-hurl.nix +++ b/overlays/modifications/fix-hurl.nix @@ -1,4 +1,4 @@ -{inputs, ...}: final: prev: let +{inputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { inherit (inputs.nixpkgs-hurl.legacyPackages.${system}) hurl; diff --git a/overlays/modifications/helix.nix b/overlays/modifications/helix.nix index 3b15a52..a759145 100644 --- a/overlays/modifications/helix.nix +++ b/overlays/modifications/helix.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { helix = outputs.packages."${system}".helix; diff --git a/overlays/modifications/juicity.nix b/overlays/modifications/juicity.nix index 61c970c..82f5472 100644 --- a/overlays/modifications/juicity.nix +++ b/overlays/modifications/juicity.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { juicity = outputs.packages."${system}".juicity; diff --git a/overlays/modifications/radicle-explorer.nix b/overlays/modifications/radicle-explorer.nix index 3e2b33e..216e7b1 100644 --- a/overlays/modifications/radicle-explorer.nix +++ b/overlays/modifications/radicle-explorer.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { radicle-explorer = outputs.packages."${system}".radicle-explorer; diff --git a/overlays/modifications/spotifyx.nix b/overlays/modifications/spotifyx.nix index 820b1d3..6395e95 100644 --- a/overlays/modifications/spotifyx.nix +++ b/overlays/modifications/spotifyx.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { spotify = outputs.packages."${system}".spotifyx; diff --git a/overlays/modifications/wshowkeys.nix b/overlays/modifications/wshowkeys.nix index eee953b..455b646 100644 --- a/overlays/modifications/wshowkeys.nix +++ b/overlays/modifications/wshowkeys.nix @@ -1,4 +1,4 @@ -{outputs, ...}: final: prev: let +{outputs, ...}: _final: prev: let inherit (prev.stdenv.hostPlatform) system; in { wshowkeys = outputs.packages.${system}.wshowkeys-mao; diff --git a/pkgs/cliphist.nix b/pkgs/cliphist.nix index 40f08f9..7f107c8 100644 --- a/pkgs/cliphist.nix +++ b/pkgs/cliphist.nix @@ -11,7 +11,7 @@ }: let inherit (srcs.cliphist) src date version; in - cliphist.overrideAttrs (final: prev: { + cliphist.overrideAttrs (_final: prev: { inherit src; version = if prev.version != "0.6.1" diff --git a/pkgs/noto-sans-cjk.nix b/pkgs/noto-sans-cjk.nix index 41d6596..50d3d42 100644 --- a/pkgs/noto-sans-cjk.nix +++ b/pkgs/noto-sans-cjk.nix @@ -5,7 +5,7 @@ }: let source = srcs.noto-sans-cjk; in - stdenvNoCC.mkDerivation (finalAttrs: { + stdenvNoCC.mkDerivation (_finalAttrs: { pname = "noto-sans-cjk"; version = source.version; diff --git a/pkgs/noto-serif-cjk.nix b/pkgs/noto-serif-cjk.nix index b0af26b..80b8f74 100644 --- a/pkgs/noto-serif-cjk.nix +++ b/pkgs/noto-serif-cjk.nix @@ -5,7 +5,7 @@ }: let source = srcs.noto-serif-cjk; in - stdenvNoCC.mkDerivation (finalAttrs: { + stdenvNoCC.mkDerivation (_finalAttrs: { pname = "noto-serif-cjk"; version = source.version; diff --git a/pkgs/spotifyx.nix b/pkgs/spotifyx.nix index d15bb46..bb9ab7f 100644 --- a/pkgs/spotifyx.nix +++ b/pkgs/spotifyx.nix @@ -7,7 +7,7 @@ srcs, }: let inherit (srcs) spotx; - spotifyx = spotify.overrideAttrs (final: prev: { + spotifyx = spotify.overrideAttrs (_final: prev: { nativeBuildInputs = prev.nativeBuildInputs ++ [ diff --git a/pkgs/wshowkeys-mao.nix b/pkgs/wshowkeys-mao.nix index f9049f8..4e85026 100644 --- a/pkgs/wshowkeys-mao.nix +++ b/pkgs/wshowkeys-mao.nix @@ -4,7 +4,7 @@ }: let inherit (srcs) wshowkeys-mao; in - wshowkeys.overrideAttrs (final: prev: { + wshowkeys.overrideAttrs (_final: _prev: { inherit (wshowkeys-mao) src; pname = "wshowkeys-mao"; version = wshowkeys-mao.date + "-" + wshowkeys-mao.version; diff --git a/templates/cxx/flake.nix b/templates/cxx/flake.nix index ac11c54..0de5c71 100644 --- a/templates/cxx/flake.nix +++ b/templates/cxx/flake.nix @@ -6,13 +6,11 @@ }; }; outputs = { - self, flake-utils, nixpkgs, ... }: flake-utils.lib.eachDefaultSystem (system: let - inherit (pkgs) lib; pkgs = import nixpkgs { inherit system; }; diff --git a/templates/cxxWithXmake/flake.nix b/templates/cxxWithXmake/flake.nix index f7c2478..90fa65e 100644 --- a/templates/cxxWithXmake/flake.nix +++ b/templates/cxxWithXmake/flake.nix @@ -12,7 +12,6 @@ ... }: flake-utils.lib.eachDefaultSystem (system: let - inherit (pkgs) lib; pkgs = import nixpkgs { inherit system; }; diff --git a/templates/python/flake.nix b/templates/python/flake.nix index f1f811f..3dd3a56 100644 --- a/templates/python/flake.nix +++ b/templates/python/flake.nix @@ -6,7 +6,6 @@ }; }; outputs = { - self, flake-utils, nixpkgs, ... diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix index d83b4f1..13917fc 100644 --- a/templates/rust/flake.nix +++ b/templates/rust/flake.nix @@ -40,7 +40,7 @@ inherit system; overlays = [ (import rust-overlay) - (final: prev: { + (_final: prev: { lib = prev.lib // (import ./nix/lib.nix prev.lib); }) ];