treewide: remove unused code (#6985)

docs/flake.nix

@@ -11,9 +11,9 @@
 
   outputs =
     {
-      self,
       nixpkgs,
       scss-reset,
+      ...
     }:
     let
       supportedSystems = [

home-manager/home-manager.nix

@@ -3,20 +3,9 @@
   confPath,
   confAttr ? null,
   check ? true,
-  newsReadIdsFile ? null,
 }:
 
 let
-  inherit (pkgs.lib)
-    concatMapStringsSep
-    fileContents
-    filter
-    length
-    optionalString
-    removeSuffix
-    replaceStrings
-    splitString
-    ;
 
   env = import ../modules {
     configuration =

lib/default.nix

@@ -10,11 +10,6 @@
       check ? true,
       # Deprecated:
       configuration ? null,
-      extraModules ? null,
-      stateVersion ? null,
-      username ? null,
-      homeDirectory ? null,
-      system ? null,
     }@args:
     let
       msgForRemovedArg = ''

modules/lib/dag.nix

@@ -126,7 +126,6 @@ in
         i: before: after: entries:
         let
           name = "${tag}-${toString i}";
-          i' = i + 1;
         in
         if entries == [ ] then
           hm.dag.empty

modules/lib/types-dag.nix

@@ -2,24 +2,13 @@
 
 let
   inherit (lib)
-    concatStringsSep
     defaultFunctor
-    fixedWidthNumber
     hm
-    imap1
-    isAttrs
-    isList
-    length
-    listToAttrs
-    mapAttrs
     mkIf
     mkOrder
     mkOption
     mkOptionType
-    nameValuePair
-    stringLength
     types
-    warn
     ;
 
   dagEntryOf =

modules/lib/types.nix

@@ -16,7 +16,6 @@ let
     mergeAttrs
     mergeDefaultOption
     mergeOneOption
-    mergeOptions
     mkOption
     mkOptionType
     showFiles

modules/programs/distrobox.nix

@@ -6,8 +6,6 @@
 }:
 let
   inherit (lib)
-    generators
-    types
     mkIf
     mkEnableOption
     mkPackageOption

modules/programs/fish.nix

@@ -16,9 +16,7 @@ let
 
   cfg = config.programs.fish;
 
-  pluginModule = types.submodule (
+  pluginModule = types.submodule {
-    { config, ... }:
-    {
     options = {
       src = mkOption {
         type = types.path;
@@ -39,8 +37,7 @@ let
         '';
       };
     };
-    }
+  };
-  );
 
   functionModule = types.submodule {
     options = {
@@ -480,7 +477,6 @@ in
               destructiveSymlinkJoin =
                 args_@{
                   name,
-                  paths,
                   preferLocalBuild ? true,
                   allowSubstitutes ? false,
                   postBuild ? "",

modules/programs/gnome-terminal.nix

@@ -17,9 +17,7 @@ let
     "tty"
   ];
 
-  backForeSubModule = types.submodule (
+  backForeSubModule = types.submodule {
-    { ... }:
-    {
     options = {
       foreground = mkOption {
         type = types.str;
@@ -31,12 +29,9 @@ let
         description = "The background color.";
       };
     };
-    }
+  };
-  );
 
-  profileColorsSubModule = types.submodule (
+  profileColorsSubModule = types.submodule {
-    { ... }:
-    {
     options = {
       foregroundColor = mkOption {
         type = types.str;
@@ -71,12 +66,9 @@ let
         description = "The colors for the terminal’s highlighted area.";
       };
     };
-    }
+  };
-  );
 
-  profileSubModule = types.submodule (
+  profileSubModule = types.submodule {
-    { name, config, ... }:
-    {
     options = {
       default = mkOption {
         default = false;
@@ -230,8 +222,7 @@ let
         description = "Background transparency in percent.";
       };
     };
-    }
+  };
-  );
 
   buildProfileSet =
     pcfg:

modules/programs/joshuto.nix

@@ -5,7 +5,7 @@
   ...
 }:
 let
-  inherit (lib) mkIf mkOption types;
+  inherit (lib) mkIf mkOption;
 
   cfg = config.programs.joshuto;
   tomlFormat = pkgs.formats.toml { };

modules/programs/lapce.nix

@@ -173,7 +173,6 @@ let
       author,
       name,
       version,
-      hash,
     }@args:
     pkgs.stdenvNoCC.mkDerivation {
       pname = "lapce-plugin-${author}-${name}";

modules/programs/mbsync-accounts.nix

@@ -12,7 +12,7 @@ let
     ]);
 
   perAccountGroups =
-    { name, config, ... }:
+    { name, ... }:
     {
       options = {
         name = mkOption {
@@ -43,7 +43,7 @@ let
 
   # Options for configuring channel(s) that will be composed together into a group.
   channel =
-    { name, config, ... }:
+    { name, ... }:
     {
       options = {
         name = mkOption {

modules/programs/mergiraf.nix

@@ -8,8 +8,6 @@ let
   inherit (lib)
     mkEnableOption
     mkPackageOption
-    types
-    literalExpression
     mkIf
     maintainers
     ;

modules/programs/ncmpcpp.nix

@@ -43,9 +43,7 @@ let
       str
     ];
 
-  bindingType = types.submodule (
+  bindingType = types.submodule {
-    { name, config, ... }:
-    {
     options = {
       key = mkOption {
         type = types.str;
@@ -59,9 +57,7 @@ let
         example = "scroll_down";
       };
     };
-    }
+  };
-  );
-
 in
 {
   meta.maintainers = [ lib.hm.maintainers.olmokramer ];

modules/programs/neovim.nix

@@ -447,7 +447,6 @@ in
       programs.neovim.generatedConfigs =
         let
           grouped = lib.lists.groupBy (x: x.type) pluginsNormalized;
-          concatConfigs = lib.concatMapStrings (p: p.config);
           configsOnly = lib.foldl (acc: p: if p.config != null then acc ++ [ p.config ] else acc) [ ];
         in
         lib.mapAttrs (name: vals: lib.concatStringsSep "\n" (configsOnly vals)) grouped;

modules/programs/onedrive.nix

@@ -11,8 +11,6 @@ let
     mkPackageOption
     mkOption
     types
-    concatStringsSep
-    mapAttrsToList
     ;
 
   cfg = config.programs.onedrive;

modules/programs/papis.nix

@@ -55,7 +55,7 @@ in
     libraries = mkOption {
       type = types.attrsOf (
         types.submodule (
-          { config, name, ... }:
+          { name, ... }:
           {
             options = {
               name = mkOption {

modules/programs/pyenv.nix

@@ -9,8 +9,6 @@ let
 
   cfg = config.programs.pyenv;
 
-  tomlFormat = pkgs.formats.toml { };
-
 in
 {
   meta.maintainers = with lib.maintainers; [ tmarkus ];

modules/programs/qcal.nix

@@ -13,14 +13,6 @@ let
     lib.filterAttrs (_: a: a.qcal.enable) config.accounts.calendar.accounts
   );
 
-  rename =
-    oldname:
-    builtins.getAttr oldname {
-      url = "Url";
-      userName = "Username";
-      passwordCommand = "PasswordCmd";
-    };
-
   filteredAccounts =
     let
       mkAccount =

modules/programs/sftpman.nix

@@ -11,9 +11,7 @@ let
 
   jsonFormat = pkgs.formats.json { };
 
-  mountOpts =
+  mountOpts = {
-    { config, name, ... }:
-    {
     options = {
       host = mkOption {
         type = types.str;

modules/programs/ssh.nix

@@ -70,9 +70,7 @@ let
     };
   };
 
-  matchBlockModule = types.submodule (
+  matchBlockModule = types.submodule {
-    { dagName, ... }:
-    {
     options = {
       host = mkOption {
         type = types.nullOr types.str;
@@ -350,8 +348,7 @@ let
     };
 
     #    config.host = mkDefault dagName;
-    }
+  };
-  );
 
   matchBlockStr =
     key: cf:

modules/programs/thunderbird.nix

@@ -275,7 +275,7 @@ in
                 feedAccounts = mkOption {
                   type = types.attrsOf (
                     types.submodule (
-                      { config, name, ... }:
+                      { name, ... }:
                       {
                         options = {
                           name = mkOption {

modules/programs/wlogout.nix

@@ -7,7 +7,6 @@
 
 let
   inherit (lib)
-    all
     filterAttrs
     isStorePath
     literalExpression

modules/programs/zplug.nix

@@ -9,9 +9,7 @@ let
 
   cfg = config.programs.zsh.zplug;
 
-  pluginModule = types.submodule (
+  pluginModule = types.submodule {
-    { config, ... }:
-    {
     options = {
       name = mkOption {
         type = types.str;
@@ -24,10 +22,7 @@ let
         description = "The plugin tags.";
       };
     };
-
+  };
-    }
-  );
-
 in
 {
   options.programs.zsh.zplug = {

modules/services/lxqt-policykit-agent.nix

@@ -8,8 +8,6 @@ let
   inherit (lib)
     mkEnableOption
     mkPackageOption
-    types
-    literalExpression
     mkIf
     maintainers
     ;

modules/services/polkit-gnome.nix

@@ -8,8 +8,6 @@ let
   inherit (lib)
     mkEnableOption
     mkPackageOption
-    types
-    literalExpression
     mkIf
     maintainers
     ;

modules/systemd.nix

@@ -12,7 +12,6 @@ let
   inherit (lib)
     any
     attrValues
-    getAttr
     hm
     isBool
     literalExpression

modules/targets/darwin/user-defaults/opts-currenthost.nix

@@ -10,15 +10,6 @@ let
         default = null;
       }
     );
-
-  mkNullableEnableOption =
-    name:
-    lib.mkOption {
-      type = with lib.types; nullOr bool;
-      default = null;
-      example = true;
-      description = "Whether to enable ${name}.";
-    };
 in
 {
   freeformType = with lib.types; attrsOf (attrsOf anything);

templates/nix-darwin/flake.nix

@@ -10,8 +10,7 @@
   };
 
   outputs =
-    inputs@{
+    {
-      nixpkgs,
       home-manager,
       darwin,
       ...

templates/nixos/flake.nix

@@ -8,7 +8,7 @@
   };
 
   outputs =
-    inputs@{ nixpkgs, home-manager, ... }:
+    { nixpkgs, home-manager, ... }:
     {
       nixosConfigurations = {
         hostname = nixpkgs.lib.nixosSystem {

tests/default.nix

@@ -41,11 +41,7 @@ let
       if lib.isDerivation value then scrubbedValue // newDrvAttrs else scrubbedValue
     else
       value;
-  scrubDerivations =
+  scrubDerivations = attrs: lib.mapAttrs scrubDerivation attrs;
-    attrs:
-    let
-    in
-    lib.mapAttrs scrubDerivation attrs;
 
   # Globally unscrub a few selected packages that are used by a wide selection of tests.
   whitelist =

tests/flake.nix

@@ -18,7 +18,7 @@
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
   outputs =
-    { self, nixpkgs, ... }:
+    { nixpkgs, ... }:
     let
       forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
     in

tests/integration/standalone/alice-home-init.nix

@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.

tests/integration/standalone/alice-home-next.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ pkgs, ... }:
 
 {
   home.username = "alice";

tests/integration/standalone/home-with-symbols-init.nix

@@ -1,5 +1,3 @@
-{ config, pkgs, ... }:
-
 {
   # Home Manager needs a bit of information about you and the paths it should
   # manage.

tests/integration/standalone/home-with-symbols.nix

@@ -2,8 +2,6 @@
 
 let
 
-  inherit (pkgs.lib) escapeShellArg;
-
   nixHome = "/home/alice@home\\extra";
   pyHome = "/home/alice@home\\\\extra";
 

tests/integration/standalone/nh.nix

@@ -2,8 +2,6 @@
 
 let
 
-  inherit (pkgs.lib) escapeShellArg;
-
   home = "/home/alice";
 
 in

tests/lib/generators/tokdl.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   home.file."tokdl-result.txt".text = lib.hm.generators.toKDL { } {

tests/lib/generators/toscfg-empty.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   home.file."toscfg-empty-result.txt".text = lib.hm.generators.toSCFG { } { };

tests/lib/generators/toscfg-err-dir-empty-name.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   home.file."toscfg-err-dir-empty-name-result.txt".text = lib.hm.generators.toSCFG { } { "" = [ ]; };

tests/lib/generators/toscfg-example.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ lib, ... }:
 
 {
   home.file."toscfg-example-result.txt".text = lib.hm.generators.toSCFG { } {

tests/lib/types/dag-merge.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 

tests/modules/misc/xdg/default-locations.nix

@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, ... }:
 {
   config = {
     # Test fallback behavior for stateVersion >= 20.09, which is pure.

tests/modules/misc/xdg/system-dirs.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/misc/xdg/user-dirs-null.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/cava/cava-basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   programs.cava = {

tests/modules/programs/cavalier/cavalier-cava-settings.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   programs.cavalier = {

tests/modules/programs/cavalier/cavalier-general-settings.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   programs.cavalier = {

tests/modules/programs/darcs/author.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   config = {
     programs.darcs = {

tests/modules/programs/darcs/boring.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   config = {
     programs.darcs = {

tests/modules/programs/fish/manpage.nix

@@ -1,4 +1,4 @@
-{ lib, pkgs, ... }:
+{ pkgs, ... }:
 {
   config = {
     programs.fish = {

tests/modules/programs/i3status-rust/with-custom.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/i3status-rust/with-default.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/i3status-rust/with-extra-settings.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/i3status-rust/with-multiple-bars.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/i3status-rust/with-version-02xx.nix

@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/kakoune/whitespace-highlighter.nix

@@ -1,5 +1,3 @@
-{ lib, ... }:
-
 {
   imports = [ ./stubs.nix ];
 

tests/modules/programs/mangohud/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/programs/mergiraf/basic-configuration.nix

@@ -1,5 +1,3 @@
-{ config, lib, ... }:
-
 {
   programs.git.enable = true;
   programs.mergiraf.enable = true;

tests/modules/programs/mpv/mpv-example-settings.nix

@@ -1,7 +1,5 @@
 {
   config,
-  lib,
-  pkgs,
   ...
 }:
 

tests/modules/programs/mpv/mpv-invalid-settings.nix

@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:

tests/modules/programs/ssh/includes.nix

@@ -1,7 +1,5 @@
 {
   config,
-  lib,
-  pkgs,
   ...
 }:
 

tests/modules/programs/swayr/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/programs/swayr/empty-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/programs/vesktop/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/programs/zsh/aliases.nix

@@ -1,5 +1,3 @@
-{ config, ... }:
-
 {
   programs.zsh = {
     enable = true;

tests/modules/services/dropbox/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/services/espanso/basic-configuration.nix

@@ -1,7 +1,4 @@
-espansoExtraArgs:
+espansoExtraArgs: {
-{ config, ... }:
-
-{
   services.espanso = {
     enable = true;
     configs = {

tests/modules/services/fnott/example-settings.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 

tests/modules/services/fnott/systemd-user-service.nix

@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }:
 

tests/modules/services/gromit-mpx/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   services.gromit-mpx = {

tests/modules/services/gromit-mpx/default-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   services.gromit-mpx = {

tests/modules/services/kanshi/alias-assertion.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   config = {
     services.kanshi = {

tests/modules/services/kanshi/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   config = {
     services.kanshi = {

tests/modules/services/kanshi/new-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 {
   config = {
     services.kanshi = {

tests/modules/services/mpdscribble/basic-configuration.nix

@@ -1,7 +1,4 @@
 {
-  config,
-  lib,
-  pkgs,
   ...
 }:
 

tests/modules/services/pantalaimon/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/services/parcellite/parcellite.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   services.parcellite = {

tests/modules/services/pass-secret-service/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   services.pass-secret-service = {

tests/modules/services/pass-secret-service/default-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   services.pass-secret-service = {

tests/modules/services/polybar/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/services/polybar/empty-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/services/sxhkd/service.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   xsession = {

tests/modules/services/trayer/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/services/wlsunset/wlsunset-service.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/services/xsettingsd/basic-configuration.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, ... }:
 
 {
   config = {

tests/modules/systemd/empty-user-config.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   nmt.script = ''
     userConf=home-files/.config/systemd/user.conf