From 088facf700946cb8f2d96c6089185bdc2a67180a Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 30 Jun 2024 09:56:30 -0400 Subject: alejandra -> nixfmt-rfc-style --- modules/nixos/server/mixins/acme.nix | 18 ++++++----- modules/nixos/server/mixins/cloudflared.nix | 18 ++++++----- modules/nixos/server/mixins/hercules.nix | 46 ++++++++++++++--------------- modules/nixos/server/mixins/nginx.nix | 10 +++---- modules/nixos/server/mixins/promtail.nix | 14 ++++----- 5 files changed, 53 insertions(+), 53 deletions(-) (limited to 'modules/nixos/server/mixins') diff --git a/modules/nixos/server/mixins/acme.nix b/modules/nixos/server/mixins/acme.nix index 0e4a6d6..e809ad4 100644 --- a/modules/nixos/server/mixins/acme.nix +++ b/modules/nixos/server/mixins/acme.nix @@ -3,19 +3,21 @@ lib, secretsDir, ... -}: let +}: +let cfg = config.server.mixins.acme; -in { +in +{ options.server.mixins.acme = { enable = lib.mkEnableOption "ACME mixin"; - manageSecrets = - lib.mkEnableOption "automatic secrets management" - // { - default = config.traits.secrets.enable; - }; + manageSecrets = lib.mkEnableOption "automatic secrets management" // { + default = config.traits.secrets.enable; + }; - useDns = lib.mkEnableOption "the usage of Cloudflare to obtain certs" // {default = true;}; + useDns = lib.mkEnableOption "the usage of Cloudflare to obtain certs" // { + default = true; + }; }; config = lib.mkIf cfg.enable ( diff --git a/modules/nixos/server/mixins/cloudflared.nix b/modules/nixos/server/mixins/cloudflared.nix index a5afb62..f781150 100644 --- a/modules/nixos/server/mixins/cloudflared.nix +++ b/modules/nixos/server/mixins/cloudflared.nix @@ -3,10 +3,12 @@ lib, secretsDir, ... -}: let +}: +let cfg = config.server.mixins.cloudflared; inherit (config.services) nginx; -in { +in +{ options.server.mixins.cloudflared = { enable = lib.mkEnableOption "cloudflared mixin"; tunnelName = lib.mkOption { @@ -18,11 +20,9 @@ in { ''; }; - manageSecrets = - lib.mkEnableOption "automatic secrets management" - // { - default = config.traits.secrets.enable; - }; + manageSecrets = lib.mkEnableOption "automatic secrets management" // { + default = config.traits.secrets.enable; + }; }; config = lib.mkIf cfg.enable ( @@ -33,7 +33,9 @@ in { tunnels.${cfg.tunnelName} = { default = "http_status:404"; - ingress = lib.mapAttrs (_: _: {service = "http://localhost:${toString nginx.defaultHTTPListenPort}";}) nginx.virtualHosts; + ingress = lib.mapAttrs (_: _: { + service = "http://localhost:${toString nginx.defaultHTTPListenPort}"; + }) nginx.virtualHosts; }; }; } diff --git a/modules/nixos/server/mixins/hercules.nix b/modules/nixos/server/mixins/hercules.nix index 103f58e..49ba46d 100644 --- a/modules/nixos/server/mixins/hercules.nix +++ b/modules/nixos/server/mixins/hercules.nix @@ -4,16 +4,16 @@ unstable, secretsDir, ... -}: let +}: +let cfg = config.server.mixins.hercules-ci; -in { +in +{ options.server.mixins.hercules-ci = { enable = lib.mkEnableOption "hercules-ci mixin"; - manageSecrets = - lib.mkEnableOption "automatic secrets management" - // { - default = config.traits.secrets.enable; - }; + manageSecrets = lib.mkEnableOption "automatic secrets management" // { + default = config.traits.secrets.enable; + }; }; config = lib.mkIf cfg.enable ( @@ -25,29 +25,29 @@ in { }; } - (let - secretNames = [ - "binaryCaches" - "clusterJoinToken" - "secretsJson" - ]; - in + ( + let + secretNames = [ + "binaryCaches" + "clusterJoinToken" + "secretsJson" + ]; + in lib.mkIf cfg.manageSecrets { - age.secrets = lib.genAttrs secretNames ( - file: { - file = "${secretsDir}/${file}.age"; - mode = "400"; - owner = "hercules-ci-agent"; - group = "hercules-ci-agent"; - } - ); + age.secrets = lib.genAttrs secretNames (file: { + file = "${secretsDir}/${file}.age"; + mode = "400"; + owner = "hercules-ci-agent"; + group = "hercules-ci-agent"; + }); services.hercules-ci-agent = { settings = lib.mapAttrs' (name: lib.nameValuePair (name + "Path")) ( lib.genAttrs secretNames (name: config.age.secrets.${name}.path) ); }; - }) + } + ) ] ); } diff --git a/modules/nixos/server/mixins/nginx.nix b/modules/nixos/server/mixins/nginx.nix index ba18ecf..11306a2 100644 --- a/modules/nixos/server/mixins/nginx.nix +++ b/modules/nixos/server/mixins/nginx.nix @@ -1,10 +1,8 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.server.mixins.nginx; -in { +in +{ options.server.mixins.nginx = { enable = lib.mkEnableOption "nginx mixin"; }; diff --git a/modules/nixos/server/mixins/promtail.nix b/modules/nixos/server/mixins/promtail.nix index 1baaac6..6b4cf32 100644 --- a/modules/nixos/server/mixins/promtail.nix +++ b/modules/nixos/server/mixins/promtail.nix @@ -1,17 +1,15 @@ -{ - config, - lib, - ... -}: let +{ config, lib, ... }: +let cfg = config.server.mixins.promtail; inherit (lib) types; -in { +in +{ options.server.mixins.promtail = { enable = lib.mkEnableOption "Promtail mixin"; clients = lib.mkOption { type = types.listOf types.attrs; - default = [{}]; + default = [ { } ]; description = "Clients for promtail"; }; }; @@ -37,7 +35,7 @@ in { relabel_configs = [ { - source_labels = ["__journal__systemd_unit"]; + source_labels = [ "__journal__systemd_unit" ]; target_label = "unit"; } ]; -- cgit v1.2.3