diff --git a/flake.nix b/flake.nix index 0a408f08..bb17a090 100644 --- a/flake.nix +++ b/flake.nix @@ -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'); diff --git a/hosts/plover/modules/services/vaultwarden.nix b/hosts/plover/modules/services/vaultwarden.nix index 244c3f19..5d1c015d 100644 --- a/hosts/plover/modules/services/vaultwarden.nix +++ b/hosts/plover/modules/services/vaultwarden.nix @@ -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}" = { }; + }; }; }) diff --git a/hosts/plover/modules/services/vouch-proxy.nix b/hosts/plover/modules/services/vouch-proxy.nix index ee5da5c6..ed6f8efc 100644 --- a/hosts/plover/modules/services/vouch-proxy.nix +++ b/hosts/plover/modules/services/vouch-proxy.nix @@ -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; diff --git a/modules/nixos/programs/distrobox.nix b/modules/nixos/programs/distrobox.nix index 85379e31..db86768f 100644 --- a/modules/nixos/programs/distrobox.nix +++ b/modules/nixos/programs/distrobox.nix @@ -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 [ diff --git a/modules/nixos/services/archivebox.nix b/modules/nixos/services/archivebox.nix index 6e11fcce..11424f8d 100644 --- a/modules/nixos/services/archivebox.nix +++ b/modules/nixos/services/archivebox.nix @@ -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 {