Skip to content

Commit

Permalink
treewide: Fix incorrect string indentations
Browse files Browse the repository at this point in the history
  • Loading branch information
piegamesde committed Dec 23, 2024
1 parent 7e99c08 commit 2b1698f
Show file tree
Hide file tree
Showing 17 changed files with 68 additions and 44 deletions.
11 changes: 6 additions & 5 deletions lib/generators.nix
Original file line number Diff line number Diff line change
Expand Up @@ -597,11 +597,12 @@ in rec {
(expr "\t${ind}" value)
]) x));

in ''<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
${expr "" v}
</plist>'';
in ''
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
${expr "" v}
</plist>'';

/**
Translate a simple Nix expression to Dhall notation.
Expand Down
4 changes: 2 additions & 2 deletions lib/lists.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1748,8 +1748,8 @@ rec {
```
:::
*/
crossLists = warn
''lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
crossLists = warn ''
lib.crossLists is deprecated, use lib.mapCartesianProduct instead.
For example, the following function call:
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/hardware/wooting.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{ config, lib, pkgs, ... }:
{
options.hardware.wooting.enable = lib.mkEnableOption ''support for Wooting keyboards.
options.hardware.wooting.enable = lib.mkEnableOption ''
support for Wooting keyboards.
Note that users must be in the "input" group for udev rules to apply'';

config = lib.mkIf config.hardware.wooting.enable {
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/services/backup/borgbackup.nix
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ let
path = [
config.services.borgbackup.package pkgs.openssh
];
script = "exec " + lib.optionalString cfg.inhibitsSleep ''\
script = "exec " + lib.optionalString cfg.inhibitsSleep ''
${pkgs.systemd}/bin/systemd-inhibit \
--who="borgbackup" \
--what="sleep" \
Expand Down Expand Up @@ -183,7 +183,7 @@ let
mode != "none" -> passCommand != null || passphrase != null;
message =
"passCommand or passphrase has to be specified because"
+ '' borgbackup.jobs.${name}.encryption != "none"'';
+ " borgbackup.jobs.${name}.encryption != \"none\"";
};

mkRepoService = name: cfg:
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/cluster/kubernetes/apiserver.nix
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,8 @@ in
after = [ "network.target" ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-apiserver \
ExecStart = ''
${top.package}/bin/kube-apiserver \
--allow-privileged=${lib.boolToString cfg.allowPrivileged} \
--authorization-mode=${lib.concatStringsSep "," cfg.authorizationMode} \
${lib.optionalString (lib.elem "ABAC" cfg.authorizationMode)
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/cluster/kubernetes/proxy.nix
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ in
path = with pkgs; [ iptables conntrack-tools ];
serviceConfig = {
Slice = "kubernetes.slice";
ExecStart = ''${top.package}/bin/kube-proxy \
ExecStart = ''
${top.package}/bin/kube-proxy \
--bind-address=${cfg.bindAddress} \
${optionalString (top.clusterCidr!=null)
"--cluster-cidr=${top.clusterCidr}"} \
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/databases/redis.nix
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@ in {
masterAuth = lib.mkOption {
type = with types; nullOr str;
default = null;
description = ''If the master is password protected (using the requirePass configuration)
description = ''
If the master is password protected (using the requirePass configuration)
it is possible to tell the slave to authenticate before starting the replication synchronization
process, otherwise the master will refuse the slave request.
(STORED PLAIN TEXT, WORLD-READABLE IN NIX STORE)'';
Expand Down
12 changes: 8 additions & 4 deletions nixos/modules/services/desktops/pipewire/wireplumber.nix
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ in
# in sections.
type = attrsOf (attrsOf json.type);
default = { };
example = literalExpression ''{
example = literalExpression ''
{
"log-level-debug" = {
"context.properties" = {
# Output Debug log messages as opposed to only the default level (Notice)
Expand All @@ -88,7 +89,8 @@ in
}
];
};
}'';
}
'';
description = ''
Additional configuration for the WirePlumber daemon when run in
single-instance mode (the default in nixpkgs and currently the only
Expand Down Expand Up @@ -166,7 +168,8 @@ in
configPackages = mkOption {
type = listOf package;
default = [ ];
example = literalExpression ''[
example = literalExpression ''
[
(pkgs.writeTextDir "share/wireplumber/wireplumber.conf.d/10-bluez.conf" '''
monitor.bluez.properties = {
bluez5.roles = [ a2dp_sink a2dp_source bap_sink bap_source hsp_hs hsp_ag hfp_hf hfp_ag ]
Expand All @@ -175,7 +178,8 @@ in
bluez5.hfphsp-backend = "native"
}
''')
]'';
]
'';
description = ''
List of packages that provide WirePlumber configuration, in the form of
`share/wireplumber/*/*.conf` files.
Expand Down
7 changes: 4 additions & 3 deletions nixos/modules/services/misc/gitlab.nix
Original file line number Diff line number Diff line change
Expand Up @@ -1080,12 +1080,13 @@ in {
warnings = [
(mkIf
(cfg.registry.enable && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0" && cfg.registry.package == pkgs.docker-distribution)
''Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
''
Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.
Please back up your data and migrate to the gitlab-container-registry package.''
)
(mkIf
(versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0")
''GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
(versionAtLeast (getVersion cfg.packages.gitlab) "16.2.0" && versionOlder (getVersion cfg.packages.gitlab) "16.5.0") ''
GitLab instances created or updated between versions [15.11.0, 15.11.2] have an incorrect database schema.
Check the upstream documentation for a workaround: https://docs.gitlab.com/ee/update/versions/gitlab_16_changes.html#undefined-column-error-upgrading-to-162-or-later''
)
];
Expand Down
5 changes: 3 additions & 2 deletions nixos/modules/services/network-filesystems/ceph.nix
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,9 @@ let
StateDirectory = stateDirectory;
User = "ceph";
Group = if daemonType == "osd" then "disk" else "ceph";
ExecStart = ''${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
-f --cluster ${clusterName} --id ${daemonId}'';
ExecStart = ''
${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} \
-f --cluster ${clusterName} --id ${daemonId}'';
} // lib.optionalAttrs (daemonType == "osd") {
ExecStartPre = "${ceph.lib}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}";
RestartSec = "20s";
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/networking/smokeping.nix
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ in
MAX 0.5 144 7200
MIN 0.5 144 7200
'';
description = ''Configure the ping frequency and retention of the rrd files.
description = ''
Configure the ping frequency and retention of the rrd files.
Once set, changing the interval will require deletion or migration of all
the collected data.'';
};
Expand Down
6 changes: 4 additions & 2 deletions nixos/modules/services/networking/tinyproxy.nix
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,16 @@ in
settings = mkOption {
description = "Configuration for [tinyproxy](https://tinyproxy.github.io/).";
default = { };
example = literalExpression ''{
example = literalExpression ''
{
Port 8888;
Listen 127.0.0.1;
Timeout 600;
Allow 127.0.0.1;
Anonymous = ['"Host"' '"Authorization"'];
ReversePath = '"/example/" "http://www.example.com/"';
}'';
}
'';
type = types.submodule ({name, ...}: {
freeformType = settingsFormat.type;
options = {
Expand Down
9 changes: 6 additions & 3 deletions nixos/modules/services/networking/wg-quick.nix
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,8 @@ let
allowedIPs = mkOption {
example = [ "10.192.122.3/32" "10.192.124.1/24" ];
type = with types; listOf str;
description = ''List of IP (v4 or v6) addresses with CIDR masks from
description = ''
List of IP (v4 or v6) addresses with CIDR masks from
which this peer is allowed to send incoming traffic and to which
outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
be specified for matching all IPv4 addresses, and ::/0 may be specified
Expand All @@ -205,15 +206,17 @@ let
default = null;
example = "demo.wireguard.io:12913";
type = with types; nullOr str;
description = ''Endpoint IP or hostname of the peer, followed by a colon,
description = ''
Endpoint IP or hostname of the peer, followed by a colon,
and then a port number of the peer.'';
};

persistentKeepalive = mkOption {
default = null;
type = with types; nullOr int;
example = 25;
description = ''This is optional and is by default off, because most
description = ''
This is optional and is by default off, because most
users will not need it. It represents, in seconds, between 1 and 65535
inclusive, how often to send an authenticated empty packet to the peer,
for the purpose of keeping a stateful firewall or NAT mapping valid
Expand Down
12 changes: 8 additions & 4 deletions nixos/modules/services/networking/wireguard.nix
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,8 @@ let
default = null;
type = with types; nullOr str;
example = "container";
description = ''The pre-existing network namespace in which the
description = ''
The pre-existing network namespace in which the
WireGuard interface is created, and which retains the socket even if the
interface is moved via {option}`interfaceNamespace`. When
`null`, the interface is created in the init namespace.
Expand All @@ -139,7 +140,8 @@ let
default = null;
type = with types; nullOr str;
example = "init";
description = ''The pre-existing network namespace the WireGuard
description = ''
The pre-existing network namespace the WireGuard
interface is moved to. The special value `init` means
the init namespace. When `null`, the interface is not
moved.
Expand Down Expand Up @@ -262,7 +264,8 @@ let
allowedIPs = mkOption {
example = [ "10.192.122.3/32" "10.192.124.1/24" ];
type = with types; listOf str;
description = ''List of IP (v4 or v6) addresses with CIDR masks from
description = ''
List of IP (v4 or v6) addresses with CIDR masks from
which this peer is allowed to send incoming traffic and to which
outgoing traffic for this peer is directed. The catch-all 0.0.0.0/0 may
be specified for matching all IPv4 addresses, and ::/0 may be specified
Expand Down Expand Up @@ -328,7 +331,8 @@ let
default = null;
type = with types; nullOr int;
example = 25;
description = ''This is optional and is by default off, because most
description = ''
This is optional and is by default off, because most
users will not need it. It represents, in seconds, between 1 and 65535
inclusive, how often to send an authenticated empty packet to the peer,
for the purpose of keeping a stateful firewall or NAT mapping valid
Expand Down
3 changes: 2 additions & 1 deletion nixos/modules/services/web-apps/galene.nix
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,8 @@ in
User = cfg.user;
Group = cfg.group;
WorkingDirectory = cfg.stateDir;
ExecStart = ''${cfg.package}/bin/galene \
ExecStart = ''
${cfg.package}/bin/galene \
${optionalString (cfg.insecure) "-insecure"} \
-http ${cfg.httpAddress}:${cfg.httpPort} \
-turn ${cfg.turnAddress} \
Expand Down
20 changes: 11 additions & 9 deletions nixos/modules/services/web-apps/nextcloud.nix
Original file line number Diff line number Diff line change
Expand Up @@ -767,15 +767,17 @@ in {
description = ''
Extra options which should be appended to Nextcloud's config.php file.
'';
example = literalExpression '' {
redis = {
host = "/run/redis/redis.sock";
port = 0;
dbindex = 0;
password = "secret";
timeout = 1.5;
};
} '';
example = literalExpression ''
{
redis = {
host = "/run/redis/redis.sock";
port = 0;
dbindex = 0;
password = "secret";
timeout = 1.5;
};
}
'';
};

secretFile = mkOption {
Expand Down
4 changes: 2 additions & 2 deletions nixos/modules/system/activation/top-level.nix
Original file line number Diff line number Diff line change
Expand Up @@ -318,8 +318,8 @@ in

system.extraSystemBuilderCmds =
optionalString
config.system.copySystemConfiguration
''ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \
config.system.copySystemConfiguration ''
ln -s '${import ../../../lib/from-env.nix "NIXOS_CONFIG" <nixos-config>}' \
"$out/configuration.nix"
'' +
optionalString
Expand Down

0 comments on commit 2b1698f

Please sign in to comment.