Auto lint/format

This commit is contained in:
renovate[bot] 2024-05-04 16:34:28 +00:00 committed by renovate[bot]
parent 6627a46d5c
commit 5a39b54ae8
22 changed files with 41 additions and 41 deletions

View file

@ -66,8 +66,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.homepage.media = mkIf cfg.addToHomepage [ mySystem.services.homepage.media = mkIf cfg.addToHomepage [

View file

@ -63,8 +63,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.homepage.media = mkIf cfg.addToHomepage [ mySystem.services.homepage.media = mkIf cfg.addToHomepage [

View file

@ -66,8 +66,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };

View file

@ -64,8 +64,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.homepage.media = mkIf cfg.addToHomepage [ mySystem.services.homepage.media = mkIf cfg.addToHomepage [

View file

@ -67,8 +67,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.homepage.media = mkIf cfg.addToHomepage [ mySystem.services.homepage.media = mkIf cfg.addToHomepage [

View file

@ -76,8 +76,8 @@ in
allowedTCPPorts = [ port ]; # I dont use rcon so not opening that too. allowedTCPPorts = [ port ]; # I dont use rcon so not opening that too.
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };

View file

@ -14,7 +14,7 @@ let
cfg = config.mySystem.services.${app}; cfg = config.mySystem.services.${app};
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
containerPersistentFolder = "/config"; containerPersistentFolder = "/config";
extraEndpoints = [ extraEndpoints = [
# TODO refactor these out into their own file or fake host? # TODO refactor these out into their own file or fake host?

View file

@ -13,7 +13,7 @@ let
port = 3000; #int port = 3000; #int
cfg = config.mySystem.services.${app}; cfg = config.mySystem.services.${app};
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
# TODO refactor out this sht # TODO refactor out this sht
settings = settings =

View file

@ -27,8 +27,8 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
virtualisation.oci-containers.containers.${app} = { virtualisation.oci-containers.containers.${app} = {

View file

@ -46,8 +46,8 @@ in
]; ];
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
services.nginx.virtualHosts."${app}.${config.networking.domain}" = { services.nginx.virtualHosts."${app}.${config.networking.domain}" = {

View file

@ -96,7 +96,7 @@ in
${app} = { ${app} = {
icon = "${app}.svg"; icon = "${app}.svg";
href = "https://${url}"; href = "https://${url}";
description = description; inherit description;
}; };
} }
]; ];

View file

@ -67,8 +67,8 @@ in
} }
]; ];
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.gatus.monitors = [{ mySystem.services.gatus.monitors = [{

View file

@ -48,8 +48,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.homepage.media = mkIf cfg.addToHomepage [ mySystem.services.homepage.media = mkIf cfg.addToHomepage [

View file

@ -12,7 +12,7 @@ let
port = 5000; #int port = 5000; #int
cfg = config.mySystem.services.${app}; cfg = config.mySystem.services.${app};
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
in in
{ {
options.mySystem.services.${app} = options.mySystem.services.${app} =

View file

@ -8,7 +8,7 @@ let
cfg = config.mySystem.security.acme; cfg = config.mySystem.security.acme;
app = "acme"; app = "acme";
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
user = app; user = app;
group = app; group = app;
@ -22,7 +22,7 @@ in
"security/acme/env".restartUnits = [ "${app}.service" ]; "security/acme/env".restartUnits = [ "${app}.service" ];
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [ "/var/lib/acme" ]; directories = [ "/var/lib/acme" ];
}; };

View file

@ -13,7 +13,7 @@ let
group = app; #string group = app; #string
port = 2342; #int port = 2342; #int
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
host = "${app}" + (if cfg.development then "-dev" else ""); host = "${app}" + (if cfg.development then "-dev" else "");
url = "${host}.${config.networking.domain}"; url = "${host}.${config.networking.domain}";
in in
@ -82,7 +82,7 @@ in
${app} = { ${app} = {
icon = "${app}.svg"; icon = "${app}.svg";
href = "https://${url}"; href = "https://${url}";
description = description; inherit description;
}; };
} }
]; ];

View file

@ -14,7 +14,7 @@ let
group = "%{group kah}"; #string group = "%{group kah}"; #string
port = %{ port }; #int port = %{ port }; #int
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
host="${app}" ++ mkIf cfg.development "-dev"; host="${app}" ++ mkIf cfg.development "-dev";
url = "${host}.${config.networking.domain}"; url = "${host}.${config.networking.domain}";
in in

View file

@ -47,8 +47,8 @@ in
]; ];
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
users.users.truxnell.extraGroups = [ "mosquitto" ]; users.users.truxnell.extraGroups = [ "mosquitto" ];

View file

@ -35,8 +35,8 @@ in
}; };
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
mySystem.services.homepage.media = mkIf cfg.addToHomepage [ mySystem.services.homepage.media = mkIf cfg.addToHomepage [

View file

@ -13,7 +13,7 @@ let
group = app; #string group = app; #string
port = 9001; #int port = 9001; #int
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
host = "${app}" + (if cfg.development then "-dev" else ""); host = "${app}" + (if cfg.development then "-dev" else "");
url = "${host}.${config.networking.domain}"; url = "${host}.${config.networking.domain}";
in in
@ -77,7 +77,7 @@ in
${app} = { ${app} = {
icon = "${app}.svg"; icon = "${app}.svg";
href = "https://${url}"; href = "https://${url}";
description = description; inherit description;
}; };
} }
]; ];

View file

@ -14,7 +14,7 @@ let
group = app; #string group = app; #string
port = 5232; #int port = 5232; #int
appFolder = "/var/lib/${app}"; appFolder = "/var/lib/${app}";
# persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}"; # persistentFolder = "${config.mySystem.persistentFolder}/var/lib/${appFolder}";
host = "${app}" + (if cfg.development then "-dev" else ""); host = "${app}" + (if cfg.development then "-dev" else "");
url = "${host}.${config.networking.domain}"; url = "${host}.${config.networking.domain}";
in in
@ -63,13 +63,13 @@ in
sops.secrets."${category}/${app}/htpasswd" = { sops.secrets."${category}/${app}/htpasswd" = {
sopsFile = ./secrets.sops.yaml; sopsFile = ./secrets.sops.yaml;
owner = user; owner = user;
group = group; inherit group;
restartUnits = [ "${app}.service" ]; restartUnits = [ "${app}.service" ];
}; };
users.users.truxnell.extraGroups = [ group ]; users.users.truxnell.extraGroups = [ group ];
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
hideMounts = true; hideMounts = true;
directories = [ "/var/lib/radicale/" ]; directories = [ "/var/lib/radicale/" ];
}; };
@ -96,7 +96,7 @@ in
${app} = { ${app} = {
icon = "${app}.svg"; icon = "${app}.svg";
href = "https://${ url }"; href = "https://${ url }";
description = description; inherit description;
}; };
} }
]; ];

View file

@ -37,7 +37,7 @@ in
include_device_information = true; include_device_information = true;
frontend = frontend =
{ {
port = port; inherit port;
url = "https://${app}.${config.networking.domain}"; url = "https://${app}.${config.networking.domain}";
}; };
client_id = "z2m"; client_id = "z2m";
@ -69,7 +69,7 @@ in
}; };
environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable { environment.persistence."${config.mySystem.system.impermanence.persistPath}" = lib.mkIf config.mySystem.system.impermanence.enable {
directories = [{ directory = appFolder; user = user; group = group; mode = "750"; }]; directories = [{ directory = appFolder; inherit user; inherit group; mode = "750"; }];
}; };
users.users.truxnell.extraGroups = [ app ]; users.users.truxnell.extraGroups = [ app ];