23.11: get rid of most warnings

This commit is contained in:
Motiejus Jakštys 2023-11-27 17:54:44 +02:00
parent 3c3758b852
commit fb310f9e29
8 changed files with 78 additions and 76 deletions

View File

@ -283,7 +283,7 @@
hooks = {
alejandra.enable = true;
deadnix.enable = true;
#statix.enable = true;
statix.enable = true;
};
};
}

View File

@ -32,8 +32,8 @@
timeZone = "UTC";
base = {
users.passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
};
unitstatus = {
enable = true;

View File

@ -39,8 +39,8 @@ in {
users = {
devEnvironment = true;
passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
};
};

View File

@ -42,8 +42,8 @@
zfs.enable = true;
users = {
passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
};
};

View File

@ -57,8 +57,8 @@
base = {
zfs.enable = true;
users.passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path;
root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
};
unitstatus = {
enable = true;

View File

@ -179,7 +179,7 @@
locate = {
enable = true;
locate = pkgs.plocate;
package = pkgs.plocate;
localuser = null;
};
};

View File

@ -14,7 +14,7 @@ in {
passwd = lib.mkOption {
type = attrsOf (submodule {
options = {
passwordFile = lib.mkOption {
hashedPasswordFile = lib.mkOption {
type = nullOr path;
default = null;
};
@ -49,7 +49,7 @@ in {
}
// lib.filterAttrs (
n: v:
(n == "passwordFile" || n == "initialPassword") && v != null
(n == "hashedPasswordFile" || n == "initialPassword") && v != null
)
cfg.passwd.motiejus or {};

View File

@ -120,7 +120,8 @@ in {
guiPortStr = builtins.toString guiPort;
in "${jakstIP}:${guiPortStr}";
extraOptions.gui.insecureAdminAccess = true;
settings = {
gui.insecureAdminAccess = true;
devices =
{}
// (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
@ -186,4 +187,5 @@ in {
);
};
};
};
}