nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 11:36:05 +01:00
Code Activity

treewide: remove unused code (#6985)

Browse source
This commit is contained in:
awwpotato 2025-05-07 08:03:21 -07:00 • committed by GitHub
parent 76274a2130
commit 5da6eafceb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
87 changed files with 613 additions and 749 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/flake.nix
View file

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

11
home-manager/home-manager.nix
View file

@ -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 =

5
lib/default.nix
View file

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

1
modules/lib/dag.nix
View file

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

11
modules/lib/types-dag.nix
View file

@ -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 =

1
modules/lib/types.nix
View file

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

2
modules/programs/distrobox.nix
View file

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

44
modules/programs/fish.nix
View file

@ -16,31 +16,28 @@ let
cfg = config.programs.fish;
pluginModule = types.submodule (
{ config, ... }:
{
options = {
src = mkOption {
type = types.path;
description = ''
Path to the plugin folder.
pluginModule = types.submodule {
options = {
src = mkOption {
type = types.path;
description = ''
Path to the plugin folder.
Relevant pieces will be added to the fish function path and
the completion path. The {file}`init.fish` and
{file}`key_binding.fish` files are sourced if
they exist.
'';
};
name = mkOption {
type = types.str;
description = ''
The name of the plugin.
'';
};
Relevant pieces will be added to the fish function path and
the completion path. The {file}`init.fish` and
{file}`key_binding.fish` files are sourced if
they exist.
'';
};
}
);
name = mkOption {
type = types.str;
description = ''
The name of the plugin.
'';
};
};
};
functionModule = types.submodule {
options = {
@ -480,7 +477,6 @@ in
destructiveSymlinkJoin =
args_@{
name,
paths,
preferLocalBuild ? true,
allowSubstitutes ? false,
postBuild ? "",

411
modules/programs/gnome-terminal.nix
View file

@ -17,221 +17,212 @@ let
"tty"
];
backForeSubModule = types.submodule (
{ ... }:
{
options = {
foreground = mkOption {
type = types.str;
description = "The foreground color.";
};
background = mkOption {
type = types.str;
description = "The background color.";
};
backForeSubModule = types.submodule {
options = {
foreground = mkOption {
type = types.str;
description = "The foreground color.";
};
}
);
profileColorsSubModule = types.submodule (
{ ... }:
{
options = {
foregroundColor = mkOption {
type = types.str;
description = "The foreground color.";
};
backgroundColor = mkOption {
type = types.str;
description = "The background color.";
};
boldColor = mkOption {
default = null;
type = types.nullOr types.str;
description = "The bold color, null to use same as foreground.";
};
palette = mkOption {
type = types.listOf types.str;
description = "The terminal palette.";
};
cursor = mkOption {
default = null;
type = types.nullOr backForeSubModule;
description = "The color for the terminal cursor.";
};
highlight = mkOption {
default = null;
type = types.nullOr backForeSubModule;
description = "The colors for the terminal’s highlighted area.";
};
background = mkOption {
type = types.str;
description = "The background color.";
};
}
);
};
};
profileSubModule = types.submodule (
{ name, config, ... }:
{
options = {
default = mkOption {
default = false;
type = types.bool;
description = "Whether this should be the default profile.";
};
visibleName = mkOption {
type = types.str;
description = "The profile name.";
};
colors = mkOption {
default = null;
type = types.nullOr profileColorsSubModule;
description = "The terminal colors, null to use system default.";
};
cursorBlinkMode = mkOption {
default = "system";
type = types.enum [
"system"
"on"
"off"
];
description = "The cursor blink mode.";
};
cursorShape = mkOption {
default = "block";
type = types.enum [
"block"
"ibeam"
"underline"
];
description = "The cursor shape.";
};
font = mkOption {
default = null;
type = types.nullOr types.str;
description = "The font name, null to use system default.";
};
allowBold = mkOption {
default = null;
type = types.nullOr types.bool;
description = ''
If `true`, allow applications in the
terminal to make text boldface.
'';
};
scrollOnOutput = mkOption {
default = true;
type = types.bool;
description = "Whether to scroll when output is written.";
};
showScrollbar = mkOption {
default = true;
type = types.bool;
description = "Whether the scroll bar should be visible.";
};
scrollbackLines = mkOption {
default = 10000;
type = types.nullOr types.int;
description = ''
The number of scrollback lines to keep, null for infinite.
'';
};
customCommand = mkOption {
default = null;
type = types.nullOr types.str;
description = ''
The command to use to start the shell, or null for default shell.
'';
};
loginShell = mkOption {
default = false;
type = types.bool;
description = "Run command as a login shell.";
};
backspaceBinding = mkOption {
default = "ascii-delete";
type = eraseBinding;
description = ''
Which string the terminal should send to an application when the user
presses the *Backspace* key.
`auto`
: Attempt to determine the right value from the terminal's IO settings.
`ascii-backspace`
: Send an ASCII backspace character (`0x08`).
`ascii-delete`
: Send an ASCII delete character (`0x7F`).
`delete-sequence`
: Send the `@7` control sequence.
`tty`
: Send terminal's "erase" setting.
'';
};
boldIsBright = mkOption {
default = null;
type = types.nullOr types.bool;
description = "Whether bold text is shown in bright colors.";
};
deleteBinding = mkOption {
default = "delete-sequence";
type = eraseBinding;
description = ''
Which string the terminal should send to an application when the user
presses the *Delete* key.
`auto`
: Send the `@7` control sequence.
`ascii-backspace`
: Send an ASCII backspace character (`0x08`).
`ascii-delete`
: Send an ASCII delete character (`0x7F`).
`delete-sequence`
: Send the `@7` control sequence.
`tty`
: Send terminal's "erase" setting.
'';
};
audibleBell = mkOption {
default = true;
type = types.bool;
description = "Turn on/off the terminal's bell.";
};
transparencyPercent = mkOption {
default = null;
type = types.nullOr (types.ints.between 0 100);
description = "Background transparency in percent.";
};
profileColorsSubModule = types.submodule {
options = {
foregroundColor = mkOption {
type = types.str;
description = "The foreground color.";
};
}
);
backgroundColor = mkOption {
type = types.str;
description = "The background color.";
};
boldColor = mkOption {
default = null;
type = types.nullOr types.str;
description = "The bold color, null to use same as foreground.";
};
palette = mkOption {
type = types.listOf types.str;
description = "The terminal palette.";
};
cursor = mkOption {
default = null;
type = types.nullOr backForeSubModule;
description = "The color for the terminal cursor.";
};
highlight = mkOption {
default = null;
type = types.nullOr backForeSubModule;
description = "The colors for the terminal’s highlighted area.";
};
};
};
profileSubModule = types.submodule {
options = {
default = mkOption {
default = false;
type = types.bool;
description = "Whether this should be the default profile.";
};
visibleName = mkOption {
type = types.str;
description = "The profile name.";
};
colors = mkOption {
default = null;
type = types.nullOr profileColorsSubModule;
description = "The terminal colors, null to use system default.";
};
cursorBlinkMode = mkOption {
default = "system";
type = types.enum [
"system"
"on"
"off"
];
description = "The cursor blink mode.";
};
cursorShape = mkOption {
default = "block";
type = types.enum [
"block"
"ibeam"
"underline"
];
description = "The cursor shape.";
};
font = mkOption {
default = null;
type = types.nullOr types.str;
description = "The font name, null to use system default.";
};
allowBold = mkOption {
default = null;
type = types.nullOr types.bool;
description = ''
If `true`, allow applications in the
terminal to make text boldface.
'';
};
scrollOnOutput = mkOption {
default = true;
type = types.bool;
description = "Whether to scroll when output is written.";
};
showScrollbar = mkOption {
default = true;
type = types.bool;
description = "Whether the scroll bar should be visible.";
};
scrollbackLines = mkOption {
default = 10000;
type = types.nullOr types.int;
description = ''
The number of scrollback lines to keep, null for infinite.
'';
};
customCommand = mkOption {
default = null;
type = types.nullOr types.str;
description = ''
The command to use to start the shell, or null for default shell.
'';
};
loginShell = mkOption {
default = false;
type = types.bool;
description = "Run command as a login shell.";
};
backspaceBinding = mkOption {
default = "ascii-delete";
type = eraseBinding;
description = ''
Which string the terminal should send to an application when the user
presses the *Backspace* key.
`auto`
: Attempt to determine the right value from the terminal's IO settings.
`ascii-backspace`
: Send an ASCII backspace character (`0x08`).
`ascii-delete`
: Send an ASCII delete character (`0x7F`).
`delete-sequence`
: Send the `@7` control sequence.
`tty`
: Send terminal's "erase" setting.
'';
};
boldIsBright = mkOption {
default = null;
type = types.nullOr types.bool;
description = "Whether bold text is shown in bright colors.";
};
deleteBinding = mkOption {
default = "delete-sequence";
type = eraseBinding;
description = ''
Which string the terminal should send to an application when the user
presses the *Delete* key.
`auto`
: Send the `@7` control sequence.
`ascii-backspace`
: Send an ASCII backspace character (`0x08`).
`ascii-delete`
: Send an ASCII delete character (`0x7F`).
`delete-sequence`
: Send the `@7` control sequence.
`tty`
: Send terminal's "erase" setting.
'';
};
audibleBell = mkOption {
default = true;
type = types.bool;
description = "Turn on/off the terminal's bell.";
};
transparencyPercent = mkOption {
default = null;
type = types.nullOr (types.ints.between 0 100);
description = "Background transparency in percent.";
};
};
};
buildProfileSet =
pcfg:

2
modules/programs/joshuto.nix
View file

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

1
modules/programs/lapce.nix
View file

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

4
modules/programs/mbsync-accounts.nix
View file

@ -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 {

2
modules/programs/mergiraf.nix
View file

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

30
modules/programs/ncmpcpp.nix
View file

@ -43,25 +43,21 @@ let
str
];
bindingType = types.submodule (
{ name, config, ... }:
{
options = {
key = mkOption {
type = types.str;
description = "Key to bind.";
example = "j";
};
command = mkOption {
type = with types; either str (listOf str);
description = "Command or sequence of commands to be executed.";
example = "scroll_down";
};
bindingType = types.submodule {
options = {
key = mkOption {
type = types.str;
description = "Key to bind.";
example = "j";
};
}
);
command = mkOption {
type = with types; either str (listOf str);
description = "Command or sequence of commands to be executed.";
example = "scroll_down";
};
};
};
in
{
meta.maintainers = [ lib.hm.maintainers.olmokramer ];

1
modules/programs/neovim.nix
View file

@ -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;

2
modules/programs/onedrive.nix
View file

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

2
modules/programs/papis.nix
View file

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

2
modules/programs/pyenv.nix
View file

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

8
modules/programs/qcal.nix
View file

@ -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 =

100
modules/programs/sftpman.nix
View file

@ -11,66 +11,64 @@ let
jsonFormat = pkgs.formats.json { };
mountOpts =
{ config, name, ... }:
{
options = {
host = mkOption {
type = types.str;
description = "The host to connect to.";
};
mountOpts = {
options = {
host = mkOption {
type = types.str;
description = "The host to connect to.";
};
port = mkOption {
type = types.port;
default = 22;
description = "The port to connect to.";
};
port = mkOption {
type = types.port;
default = 22;
description = "The port to connect to.";
};
user = mkOption {
type = types.str;
description = "The username to authenticate with.";
};
user = mkOption {
type = types.str;
description = "The username to authenticate with.";
};
mountOptions = mkOption {
type = types.listOf types.str;
default = [ ];
description = "Options to pass to sshfs.";
};
mountOptions = mkOption {
type = types.listOf types.str;
default = [ ];
description = "Options to pass to sshfs.";
};
mountPoint = mkOption {
type = types.str;
description = "The remote path to mount.";
};
mountPoint = mkOption {
type = types.str;
description = "The remote path to mount.";
};
authType = mkOption {
type = types.enum [
"password"
"publickey"
"hostbased"
"keyboard-interactive"
"gssapi-with-mic"
];
default = "publickey";
description = "The authentication method to use.";
};
authType = mkOption {
type = types.enum [
"password"
"publickey"
"hostbased"
"keyboard-interactive"
"gssapi-with-mic"
];
default = "publickey";
description = "The authentication method to use.";
};
sshKey = mkOption {
type = types.nullOr types.str;
default = cfg.defaultSshKey;
defaultText = lib.literalExpression "config.programs.sftpman.defaultSshKey";
description = ''
Path to the SSH key to use for authentication.
Only applies if authMethod is `publickey`.
'';
};
sshKey = mkOption {
type = types.nullOr types.str;
default = cfg.defaultSshKey;
defaultText = lib.literalExpression "config.programs.sftpman.defaultSshKey";
description = ''
Path to the SSH key to use for authentication.
Only applies if authMethod is `publickey`.
'';
};
beforeMount = mkOption {
type = types.str;
default = "true";
description = "Command to run before mounting.";
};
beforeMount = mkOption {
type = types.str;
default = "true";
description = "Command to run before mounting.";
};
};
};
in
{
meta.maintainers = with lib.maintainers; [ fugi ];

557
modules/programs/ssh.nix
View file

@ -70,288 +70,285 @@ let
};
};
matchBlockModule = types.submodule (
{ dagName, ... }:
{
options = {
host = mkOption {
type = types.nullOr types.str;
default = null;
example = "*.example.org";
description = ''
`Host` pattern used by this conditional block.
See
{manpage}`ssh_config(5)`
for `Host` block details.
This option is ignored if
{option}`ssh.matchBlocks.*.match`
if defined.
'';
};
match = mkOption {
type = types.nullOr types.str;
default = null;
example = ''
host <hostname> canonical
host <hostname> exec "ping -c1 -q 192.168.17.1"'';
description = ''
`Match` block conditions used by this block. See
{manpage}`ssh_config(5)`
for `Match` block details.
This option takes precedence over
{option}`ssh.matchBlocks.*.host`
if defined.
'';
};
port = mkOption {
type = types.nullOr types.port;
default = null;
description = "Specifies port number to connect on remote host.";
};
forwardAgent = mkOption {
default = null;
type = types.nullOr types.bool;
description = ''
Whether the connection to the authentication agent (if any)
will be forwarded to the remote machine.
'';
};
forwardX11 = mkOption {
type = types.bool;
default = false;
description = ''
Specifies whether X11 connections will be automatically redirected
over the secure channel and {env}`DISPLAY` set.
'';
};
forwardX11Trusted = mkOption {
type = types.bool;
default = false;
description = ''
Specifies whether remote X11 clients will have full access to the
original X11 display.
'';
};
identitiesOnly = mkOption {
type = types.bool;
default = false;
description = ''
Specifies that ssh should only use the authentication
identity explicitly configured in the
{file}`~/.ssh/config` files or passed on the
ssh command-line, even if {command}`ssh-agent`
offers more identities.
'';
};
identityFile = mkOption {
type = with types; either (listOf str) (nullOr str);
default = [ ];
apply =
p:
if p == null then
[ ]
else if lib.isString p then
[ p ]
else
p;
description = ''
Specifies files from which the user identity is read.
Identities will be tried in the given order.
'';
};
identityAgent = mkOption {
type = with types; either (listOf str) (nullOr str);
default = [ ];
apply =
p:
if p == null then
[ ]
else if lib.isString p then
[ p ]
else
p;
description = ''
Specifies the location of the ssh identity agent.
'';
};
user = mkOption {
type = types.nullOr types.str;
default = null;
description = "Specifies the user to log in as.";
};
hostname = mkOption {
type = types.nullOr types.str;
default = null;
description = "Specifies the real host name to log into.";
};
serverAliveInterval = mkOption {
type = types.int;
default = 0;
description = "Set timeout in seconds after which response will be requested.";
};
serverAliveCountMax = mkOption {
type = types.ints.positive;
default = 3;
description = ''
Sets the number of server alive messages which may be sent
without SSH receiving any messages back from the server.
'';
};
sendEnv = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Environment variables to send from the local host to the
server.
'';
};
setEnv = mkOption {
type =
with types;
attrsOf (oneOf [
str
path
int
float
]);
default = { };
description = ''
Environment variables and their value to send to the server.
'';
};
compression = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
Specifies whether to use compression. Omitted from the host
block when `null`.
'';
};
checkHostIP = mkOption {
type = types.bool;
default = true;
description = ''
Check the host IP address in the
{file}`known_hosts` file.
'';
};
proxyCommand = mkOption {
type = types.nullOr types.str;
default = null;
description = "The command to use to connect to the server.";
};
proxyJump = mkOption {
type = types.nullOr types.str;
default = null;
description = "The proxy host to use to connect to the server.";
};
certificateFile = mkOption {
type = with types; either (listOf str) (nullOr str);
default = [ ];
apply =
p:
if p == null then
[ ]
else if lib.isString p then
[ p ]
else
p;
description = ''
Specifies files from which the user certificate is read.
'';
};
addressFamily = mkOption {
default = null;
type = types.nullOr (
types.enum [
"any"
"inet"
"inet6"
]
);
description = ''
Specifies which address family to use when connecting.
'';
};
localForwards = mkOption {
type = types.listOf forwardModule;
default = [ ];
example = literalExpression ''
[
{
bind.port = 8080;
host.address = "10.0.0.13";
host.port = 80;
}
];
'';
description = ''
Specify local port forwardings. See
{manpage}`ssh_config(5)` for `LocalForward`.
'';
};
remoteForwards = mkOption {
type = types.listOf forwardModule;
default = [ ];
example = literalExpression ''
[
{
bind.port = 8080;
host.address = "10.0.0.13";
host.port = 80;
}
];
'';
description = ''
Specify remote port forwardings. See
{manpage}`ssh_config(5)` for `RemoteForward`.
'';
};
dynamicForwards = mkOption {
type = types.listOf dynamicForwardModule;
default = [ ];
example = literalExpression ''
[ { port = 8080; } ];
'';
description = ''
Specify dynamic port forwardings. See
{manpage}`ssh_config(5)` for `DynamicForward`.
'';
};
extraOptions = mkOption {
type = types.attrsOf types.str;
default = { };
description = "Extra configuration options for the host.";
};
matchBlockModule = types.submodule {
options = {
host = mkOption {
type = types.nullOr types.str;
default = null;
example = "*.example.org";
description = ''
`Host` pattern used by this conditional block.
See
{manpage}`ssh_config(5)`
for `Host` block details.
This option is ignored if
{option}`ssh.matchBlocks.*.match`
if defined.
'';
};
# config.host = mkDefault dagName;
}
);
match = mkOption {
type = types.nullOr types.str;
default = null;
example = ''
host <hostname> canonical
host <hostname> exec "ping -c1 -q 192.168.17.1"'';
description = ''
`Match` block conditions used by this block. See
{manpage}`ssh_config(5)`
for `Match` block details.
This option takes precedence over
{option}`ssh.matchBlocks.*.host`
if defined.
'';
};
port = mkOption {
type = types.nullOr types.port;
default = null;
description = "Specifies port number to connect on remote host.";
};
forwardAgent = mkOption {
default = null;
type = types.nullOr types.bool;
description = ''
Whether the connection to the authentication agent (if any)
will be forwarded to the remote machine.
'';
};
forwardX11 = mkOption {
type = types.bool;
default = false;
description = ''
Specifies whether X11 connections will be automatically redirected
over the secure channel and {env}`DISPLAY` set.
'';
};
forwardX11Trusted = mkOption {
type = types.bool;
default = false;
description = ''
Specifies whether remote X11 clients will have full access to the
original X11 display.
'';
};
identitiesOnly = mkOption {
type = types.bool;
default = false;
description = ''
Specifies that ssh should only use the authentication
identity explicitly configured in the
{file}`~/.ssh/config` files or passed on the
ssh command-line, even if {command}`ssh-agent`
offers more identities.
'';
};
identityFile = mkOption {
type = with types; either (listOf str) (nullOr str);
default = [ ];
apply =
p:
if p == null then
[ ]
else if lib.isString p then
[ p ]
else
p;
description = ''
Specifies files from which the user identity is read.
Identities will be tried in the given order.
'';
};
identityAgent = mkOption {
type = with types; either (listOf str) (nullOr str);
default = [ ];
apply =
p:
if p == null then
[ ]
else if lib.isString p then
[ p ]
else
p;
description = ''
Specifies the location of the ssh identity agent.
'';
};
user = mkOption {
type = types.nullOr types.str;
default = null;
description = "Specifies the user to log in as.";
};
hostname = mkOption {
type = types.nullOr types.str;
default = null;
description = "Specifies the real host name to log into.";
};
serverAliveInterval = mkOption {
type = types.int;
default = 0;
description = "Set timeout in seconds after which response will be requested.";
};
serverAliveCountMax = mkOption {
type = types.ints.positive;
default = 3;
description = ''
Sets the number of server alive messages which may be sent
without SSH receiving any messages back from the server.
'';
};
sendEnv = mkOption {
type = types.listOf types.str;
default = [ ];
description = ''
Environment variables to send from the local host to the
server.
'';
};
setEnv = mkOption {
type =
with types;
attrsOf (oneOf [
str
path
int
float
]);
default = { };
description = ''
Environment variables and their value to send to the server.
'';
};
compression = mkOption {
type = types.nullOr types.bool;
default = null;
description = ''
Specifies whether to use compression. Omitted from the host
block when `null`.
'';
};
checkHostIP = mkOption {
type = types.bool;
default = true;
description = ''
Check the host IP address in the
{file}`known_hosts` file.
'';
};
proxyCommand = mkOption {
type = types.nullOr types.str;
default = null;
description = "The command to use to connect to the server.";
};
proxyJump = mkOption {
type = types.nullOr types.str;
default = null;
description = "The proxy host to use to connect to the server.";
};
certificateFile = mkOption {
type = with types; either (listOf str) (nullOr str);
default = [ ];
apply =
p:
if p == null then
[ ]
else if lib.isString p then
[ p ]
else
p;
description = ''
Specifies files from which the user certificate is read.
'';
};
addressFamily = mkOption {
default = null;
type = types.nullOr (
types.enum [
"any"
"inet"
"inet6"
]
);
description = ''
Specifies which address family to use when connecting.
'';
};
localForwards = mkOption {
type = types.listOf forwardModule;
default = [ ];
example = literalExpression ''
[
{
bind.port = 8080;
host.address = "10.0.0.13";
host.port = 80;
}
];
'';
description = ''
Specify local port forwardings. See
{manpage}`ssh_config(5)` for `LocalForward`.
'';
};
remoteForwards = mkOption {
type = types.listOf forwardModule;
default = [ ];
example = literalExpression ''
[
{
bind.port = 8080;
host.address = "10.0.0.13";
host.port = 80;
}
];
'';
description = ''
Specify remote port forwardings. See
{manpage}`ssh_config(5)` for `RemoteForward`.
'';
};
dynamicForwards = mkOption {
type = types.listOf dynamicForwardModule;
default = [ ];
example = literalExpression ''
[ { port = 8080; } ];
'';
description = ''
Specify dynamic port forwardings. See
{manpage}`ssh_config(5)` for `DynamicForward`.
'';
};
extraOptions = mkOption {
type = types.attrsOf types.str;
default = { };
description = "Extra configuration options for the host.";
};
};
# config.host = mkDefault dagName;
};
matchBlockStr =
key: cf:

2
modules/programs/thunderbird.nix
View file

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

1
modules/programs/wlogout.nix
View file

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

29
modules/programs/zplug.nix
View file

@ -9,25 +9,20 @@ let
cfg = config.programs.zsh.zplug;
pluginModule = types.submodule (
{ config, ... }:
{
options = {
name = mkOption {
type = types.str;
description = "The name of the plugin.";
};
tags = mkOption {
type = types.listOf types.str;
default = [ ];
description = "The plugin tags.";
};
pluginModule = types.submodule {
options = {
name = mkOption {
type = types.str;
description = "The name of the plugin.";
};
}
);
tags = mkOption {
type = types.listOf types.str;
default = [ ];
description = "The plugin tags.";
};
};
};
in
{
options.programs.zsh.zplug = {

2
modules/services/lxqt-policykit-agent.nix
View file

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

2
modules/services/polkit-gnome.nix
View file

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

1
modules/systemd.nix
View file

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

9
modules/targets/darwin/user-defaults/opts-currenthost.nix
View file

@ -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);

3
templates/nix-darwin/flake.nix
View file

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

2
templates/nixos/flake.nix
View file

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

6
tests/default.nix
View file

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

2
tests/flake.nix
View file

@ -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

2
tests/integration/standalone/alice-home-init.nix
View file

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

2
tests/integration/standalone/alice-home-next.nix
View file

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

2
tests/integration/standalone/home-with-symbols-init.nix
View file

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

2
tests/integration/standalone/home-with-symbols.nix
View file

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

2
tests/integration/standalone/nh.nix
View file

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

2
tests/lib/generators/tokdl.nix
View file

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

2
tests/lib/generators/toscfg-empty.nix
View file

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

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

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

2
tests/lib/generators/toscfg-example.nix
View file

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

1
tests/lib/types/dag-merge.nix
View file

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

2
tests/modules/misc/xdg/default-locations.nix
View file

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

1
tests/modules/misc/xdg/system-dirs.nix
View file

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

1
tests/modules/misc/xdg/user-dirs-null.nix
View file

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

2
tests/modules/programs/cava/cava-basic-configuration.nix
View file

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

2
tests/modules/programs/cavalier/cavalier-cava-settings.nix
View file

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

2
tests/modules/programs/cavalier/cavalier-general-settings.nix
View file

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

2
tests/modules/programs/darcs/author.nix
View file

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

2
tests/modules/programs/darcs/boring.nix
View file

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

2
tests/modules/programs/fish/manpage.nix
View file

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

1
tests/modules/programs/i3status-rust/with-custom.nix
View file

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

1
tests/modules/programs/i3status-rust/with-default.nix
View file

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

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

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

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

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

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

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

2
tests/modules/programs/kakoune/whitespace-highlighter.nix
View file

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

2
tests/modules/programs/mangohud/basic-configuration.nix
View file

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

2
tests/modules/programs/mergiraf/basic-configuration.nix
View file

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

2
tests/modules/programs/mpv/mpv-example-settings.nix
View file

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

2
tests/modules/programs/mpv/mpv-invalid-settings.nix
View file

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

2
tests/modules/programs/ssh/includes.nix
View file

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

2
tests/modules/programs/swayr/basic-configuration.nix
View file

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

2
tests/modules/programs/swayr/empty-configuration.nix
View file

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

2
tests/modules/programs/vesktop/basic-configuration.nix
View file

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

2
tests/modules/programs/zsh/aliases.nix
View file

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

2
tests/modules/services/dropbox/basic-configuration.nix
View file

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

5
tests/modules/services/espanso/basic-configuration.nix
View file

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

1
tests/modules/services/fnott/example-settings.nix
View file

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

1
tests/modules/services/fnott/systemd-user-service.nix
View file

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

2
tests/modules/services/gromit-mpx/basic-configuration.nix
View file

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

2
tests/modules/services/gromit-mpx/default-configuration.nix
View file

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

2
tests/modules/services/kanshi/alias-assertion.nix
View file

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

2
tests/modules/services/kanshi/basic-configuration.nix
View file

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

2
tests/modules/services/kanshi/new-configuration.nix
View file

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

3
tests/modules/services/mpdscribble/basic-configuration.nix
View file

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

2
tests/modules/services/pantalaimon/basic-configuration.nix
View file

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

2
tests/modules/services/parcellite/parcellite.nix
View file

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

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

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

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

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

2
tests/modules/services/polybar/basic-configuration.nix
View file

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

2
tests/modules/services/polybar/empty-configuration.nix
View file

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

2
tests/modules/services/sxhkd/service.nix
View file

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

2
tests/modules/services/trayer/basic-configuration.nix
View file

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

2
tests/modules/services/wlsunset/wlsunset-service.nix
View file

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

2
tests/modules/services/xsettingsd/basic-configuration.nix
View file

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

2
tests/modules/systemd/empty-user-config.nix
View file

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