motiejus
/
config
1
Fork 0
Code Packages Releases Activity

23.11: get rid of most warnings

compress-drv-tests
Motiejus Jakštys 2023-11-27 17:54:44 +02:00
parent 3c3758b852
commit fb310f9e29
8 changed files with 78 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

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

4
hosts/fra1-a/configuration.nix
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;

4
hosts/fwminex/configuration.nix
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;
};
};

4
hosts/vno1-oh2/configuration.nix
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;
};
};

4
hosts/vno3-rp3b/configuration.nix
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;

2
modules/base/default.nix
View File

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

4
modules/base/users/default.nix
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 {};

130
modules/services/syncthing/default.nix
View File

@ -120,70 +120,72 @@ in {
guiPortStr = builtins.toString guiPort;
in "${jakstIP}:${guiPortStr}";
extraOptions.gui.insecureAdminAccess = true;
devices =
{}
// (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
inherit
(devices)
mtwork
fwminex
vno1-oh2
mxp10
rzj-744P2PE
KrekenavosNamai
vno1-vinc
vno2-irena
;
})
// (lib.optionalAttrs (config.networking.hostName == "fwminex") {
inherit
(devices)
mtwork
fwminex
vno1-oh2
mxp10
rzj-744P2PE
vno1-vinc
;
})
// {};
folders = with folders;
{}
// (
lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
"/var/www/dl/tel" = www-mxp10;
"/var/www/dl/fwminex" = www-fwminex;
"/var/www/dl/mykolo" = mykolo;
"${cfg.dataDir}/M-V" = M-V;
"${cfg.dataDir}/annex2/Books" = Books;
"${cfg.dataDir}/annex2/M-Active" = M-Active;
"${cfg.dataDir}/annex2/M-Camera" = M-Camera;
"${cfg.dataDir}/annex2/M-Documents" = M-Documents;
"${cfg.dataDir}/annex2/R-Documents" = R-Documents;
"${cfg.dataDir}/annex2/Pictures" = Pictures;
"${cfg.dataDir}/annex2/M-R" = M-R;
"${cfg.dataDir}/stud-cache" = stud-cache;
"${cfg.dataDir}/video/shared" = video-shared;
"${cfg.dataDir}/music" = Music;
"${cfg.dataDir}/irenos" = Irenos;
}
)
// (
lib.optionalAttrs (config.networking.hostName == "fwminex") {
"${cfg.dataDir}/Books" = Books;
"${cfg.dataDir}/M-Active" = M-Active;
"${cfg.dataDir}/M-Documents" = M-Documents;
"${cfg.dataDir}/M-Camera" = M-Camera;
"${cfg.dataDir}/Pictures" = Pictures;
"${cfg.dataDir}/Music" = Music;
"${cfg.dataDir}/M-R" = M-R;
"${cfg.dataDir}/M-V" = M-V;
"${cfg.dataDir}/Video" = video-shared;
"${cfg.dataDir}/stud-cache" = stud-cache;
"${cfg.dataDir}/www" = www-fwminex;
}
);
settings = {
gui.insecureAdminAccess = true;
devices =
{}
// (lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
inherit
(devices)
mtwork
fwminex
vno1-oh2
mxp10
rzj-744P2PE
KrekenavosNamai
vno1-vinc
vno2-irena
;
})
// (lib.optionalAttrs (config.networking.hostName == "fwminex") {
inherit
(devices)
mtwork
fwminex
vno1-oh2
mxp10
rzj-744P2PE
vno1-vinc
;
})
// {};
folders = with folders;
{}
// (
lib.optionalAttrs (config.networking.hostName == "vno1-oh2") {
"/var/www/dl/tel" = www-mxp10;
"/var/www/dl/fwminex" = www-fwminex;
"/var/www/dl/mykolo" = mykolo;
"${cfg.dataDir}/M-V" = M-V;
"${cfg.dataDir}/annex2/Books" = Books;
"${cfg.dataDir}/annex2/M-Active" = M-Active;
"${cfg.dataDir}/annex2/M-Camera" = M-Camera;
"${cfg.dataDir}/annex2/M-Documents" = M-Documents;
"${cfg.dataDir}/annex2/R-Documents" = R-Documents;
"${cfg.dataDir}/annex2/Pictures" = Pictures;
"${cfg.dataDir}/annex2/M-R" = M-R;
"${cfg.dataDir}/stud-cache" = stud-cache;
"${cfg.dataDir}/video/shared" = video-shared;
"${cfg.dataDir}/music" = Music;
"${cfg.dataDir}/irenos" = Irenos;
}
)
// (
lib.optionalAttrs (config.networking.hostName == "fwminex") {
"${cfg.dataDir}/Books" = Books;
"${cfg.dataDir}/M-Active" = M-Active;
"${cfg.dataDir}/M-Documents" = M-Documents;
"${cfg.dataDir}/M-Camera" = M-Camera;
"${cfg.dataDir}/Pictures" = Pictures;
"${cfg.dataDir}/Music" = Music;
"${cfg.dataDir}/M-R" = M-R;
"${cfg.dataDir}/M-V" = M-V;
"${cfg.dataDir}/Video" = video-shared;
"${cfg.dataDir}/stud-cache" = stud-cache;
"${cfg.dataDir}/www" = www-fwminex;
}
);
};
};
};
}