motiejus/config
1
Fork 0
Code Packages Releases Activity

23.11: get rid of most warnings

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
flake.nix
View File

@ -283,7 +283,7 @@
hooks = { hooks = {
alejandra.enable = true; alejandra.enable = true;
deadnix.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"; timeZone = "UTC";
base = { base = {
users.passwd = { users.passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path; root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path; motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
}; };
unitstatus = { unitstatus = {
enable = true; enable = true;

4
hosts/fwminex/configuration.nix
View File

@ -39,8 +39,8 @@ in {
users = { users = {
devEnvironment = true; devEnvironment = true;
passwd = { passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path; root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-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; zfs.enable = true;
users = { users = {
passwd = { passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path; root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-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 = { base = {
zfs.enable = true; zfs.enable = true;
users.passwd = { users.passwd = {
root.passwordFile = config.age.secrets.root-passwd-hash.path; root.hashedPasswordFile = config.age.secrets.root-passwd-hash.path;
motiejus.passwordFile = config.age.secrets.motiejus-passwd-hash.path; motiejus.hashedPasswordFile = config.age.secrets.motiejus-passwd-hash.path;
}; };
unitstatus = { unitstatus = {
enable = true; enable = true;

2
modules/base/default.nix
View File

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

4
modules/base/users/default.nix
View File

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

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

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