foodogsquared/nixos-config
1
0
Fork 0
mirror of https://github.com/foo-dogsquared/nixos-config.git synced 2025-01-30 22:57:55 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

chore: reformat codebase

Browse Source
This commit is contained in:
Gabriel Arazas 2023-12-13 11:28:45 +08:00
parent a526f5d505
commit 3714f843d0
No known key found for this signature in database
GPG Key ID: ADE0C41DAB221FCC
5 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
flake.nix
View File

@ -376,7 +376,7 @@
lib'.mapAttrs
(host: metadata:
mkHost {
extraModules = [(hostSpecificModule host metadata)];
extraModules = [ (hostSpecificModule host metadata) ];
system = metadata._system;
nixpkgs-channel = metadata.nixpkgs-channel or "nixpkgs";
})
@ -454,7 +454,7 @@
in
lib'.nameValuePair name (mkImage {
inherit format system pkgs;
extraModules = [(hostSpecificModule host metadata)];
extraModules = [ (hostSpecificModule host metadata) ];
}))
images');

15
hosts/plover/modules/services/vaultwarden.nix
View File

@ -177,13 +177,14 @@ in
zone services;
keepalive 2;
'';
servers = let
address = config.services.vaultwarden.config.ROCKET_ADDRESS;
port = config.services.vaultwarden.config.ROCKET_PORT;
in
{
"${address}:${builtins.toString port}" = { };
};
servers =
let
address = config.services.vaultwarden.config.ROCKET_ADDRESS;
port = config.services.vaultwarden.config.ROCKET_PORT;
in
{
"${address}:${builtins.toString port}" = { };
};
};
})

20
hosts/plover/modules/services/vouch-proxy.nix
View File

@ -13,16 +13,18 @@ in
config = lib.mkIf cfg.enable (lib.mkMerge [
{
sops.secrets = let
vouchPermissions = rec {
owner = "vouch-proxy";
group = owner;
mode = "0400";
sops.secrets =
let
vouchPermissions = rec {
owner = "vouch-proxy";
group = owner;
mode = "0400";
};
in
lib.getSecrets ../../secrets/secrets.yaml {
"vouch-proxy/jwt/secret" = vouchPermissions;
"vouch-proxy/client/secret" = vouchPermissions;
};
in lib.getSecrets ../../secrets/secrets.yaml {
"vouch-proxy/jwt/secret" = vouchPermissions;
"vouch-proxy/client/secret" = vouchPermissions;
};
services.vouch-proxy = {
enable = true;

21
modules/nixos/programs/distrobox.nix
View File

@ -8,18 +8,19 @@ let
# values with shell expansions.
toDistroboxConf = lib.generators.toKeyValue {
listsAsDuplicateKeys = false;
mkKeyValue = lib.generators.mkKeyValueDefault {
mkValueString = v:
if v == true then "1"
else if v == false then "0"
else if lib.isString v then ''"${v}"''
else if lib.isPath v then lib.escapeShellArg v
else if lib.isList v then ''"${lib.concatStringsSep " " v}"''
else lib.generators.mkValueStringDefault { } v;
} "=";
mkKeyValue = lib.generators.mkKeyValueDefault
{
mkValueString = v:
if v == true then "1"
else if v == false then "0"
else if lib.isString v then ''"${v}"''
else if lib.isPath v then lib.escapeShellArg v
else if lib.isList v then ''"${lib.concatStringsSep " " v}"''
else lib.generators.mkValueStringDefault { } v;
} "=";
};
distroboxConf = { }: {
distroboxConf = {}: {
type = with lib.types;
let
valueType = (oneOf [

18
modules/nixos/services/archivebox.nix
View File

@ -49,7 +49,7 @@ let
after = [ "network.target" ];
documentation = [ "https://docs.archivebox.io/" ];
preStart = ''
mkdir -p ${lib.escapeShellArg cfg.archivePath}
mkdir -p ${lib.escapeShellArg cfg.archivePath}
'';
path = [ cfg.package ] ++ cfg.extraPackages;
script = ''
@ -96,14 +96,14 @@ let
lib.nameValuePair (jobUnitName name) {
description =
"Archivebox download job '${name}'";
after = [ "network.target" ];
documentation = [ "https://docs.archivebox.io/" ];
timerConfig = {
Persistent = true;
OnCalendar = value.startAt;
RandomizedDelaySec = 120;
};
wantedBy = [ "timers.target" ];
after = [ "network.target" ];
documentation = [ "https://docs.archivebox.io/" ];
timerConfig = {
Persistent = true;
OnCalendar = value.startAt;
RandomizedDelaySec = 120;
};
wantedBy = [ "timers.target" ];
};
in
{