From 743d7eead98b773c5952d41843cb7f61572ff49c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 7 Nov 2023 23:13:51 +0100 Subject: [PATCH] treewide: fix statix errors --- flake.nix | 2 +- machines/core/modules.nix | 2 +- machines/core/network.nix | 2 +- machines/newton/boot.nix | 2 +- machines/newton/services.nix | 2 +- machines/newton/system.nix | 2 +- machines/serverle/hardware-configuration.nix | 2 +- machines/serverle/network.nix | 2 +- machines/serverle/services.nix | 2 +- machines/serverle/system.nix | 2 +- machines/thinkman/boot.nix | 2 +- machines/thinkman/hardware-configuration.nix | 4 ++-- machines/thinkman/network.nix | 2 +- machines/thinkman/profiles.nix | 2 +- machines/thinkman/services.nix | 2 +- machines/thinkman/system.nix | 2 +- modules/hardware/drive-monitor/default.nix | 2 +- modules/services/alertmanager/default.nix | 4 ++-- modules/services/aria2/default.nix | 2 +- modules/services/backup/default.nix | 4 ++-- modules/services/bazarr/default.nix | 2 +- modules/services/blocky/default.nix | 2 +- modules/services/dyndns/default.nix | 5 ++--- modules/services/exportarr/default.nix | 2 +- modules/services/freshrss/default.nix | 2 +- modules/services/gitea/default.nix | 2 +- modules/services/grafana/default.nix | 2 +- modules/services/hedgedoc/default.nix | 4 ++-- modules/services/home-assistant/default.nix | 8 +++----- modules/services/homepage/default.nix | 2 +- modules/services/homer/config.nix | 7 ++----- modules/services/homer/default.nix | 2 +- modules/services/jellyfin/default.nix | 2 +- modules/services/jellyseerr/default.nix | 2 +- modules/services/loki/default.nix | 9 ++++----- modules/services/navidrome/default.nix | 4 ++-- modules/services/nextcloud/default.nix | 4 ++-- modules/services/nginx/default.nix | 8 ++++---- modules/services/paperless/default.nix | 2 +- modules/services/passworts/default.nix | 2 +- modules/services/photoprism/default.nix | 7 ++----- modules/services/prometheus/default.nix | 8 ++++---- modules/services/promtail/default.nix | 2 +- modules/services/prowlarr/default.nix | 4 ++-- modules/services/radarr/default.nix | 4 ++-- modules/services/sonarr/default.nix | 4 ++-- modules/services/tandoor-recipes/default.nix | 4 ++-- pkgs/grafana-dashboards/default.nix | 2 +- 48 files changed, 72 insertions(+), 82 deletions(-) diff --git a/flake.nix b/flake.nix index 67a01a2..10138a0 100644 --- a/flake.nix +++ b/flake.nix @@ -61,7 +61,7 @@ # prevent rebuilding deploy-rs everytime when nixpkgs changes overlays = [ deploy-rs.overlay - (_self: super: { deploy-rs = { inherit (pkgs) deploy-rs; lib = super.deploy-rs.lib; }; }) + (_self: super: { deploy-rs = { inherit (pkgs) deploy-rs; inherit (super.deploy-rs) lib; }; }) ]; }; diff --git a/machines/core/modules.nix b/machines/core/modules.nix index d6a6eac..e9cffbb 100644 --- a/machines/core/modules.nix +++ b/machines/core/modules.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { boot.initrd = { availableKernelModules = [ diff --git a/machines/core/network.nix b/machines/core/network.nix index e44b0a1..b5eeb51 100644 --- a/machines/core/network.nix +++ b/machines/core/network.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { networking.networkmanager = { enable = true; diff --git a/machines/newton/boot.nix b/machines/newton/boot.nix index f78087f..935a6f5 100644 --- a/machines/newton/boot.nix +++ b/machines/newton/boot.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { boot.loader = { timeout = 1; diff --git a/machines/newton/services.nix b/machines/newton/services.nix index 1590d48..3b133d9 100644 --- a/machines/newton/services.nix +++ b/machines/newton/services.nix @@ -1,7 +1,7 @@ # Deployed services { config, ... }: let - secrets = config.sops.secrets; + inherit (config.sops) secrets; in { sops.secrets."acme/inwx" = { }; diff --git a/machines/newton/system.nix b/machines/newton/system.nix index f743629..6832efb 100644 --- a/machines/newton/system.nix +++ b/machines/newton/system.nix @@ -1,5 +1,5 @@ # enabled system services -{ ... }: +_: { my.system = { podman.enable = true; diff --git a/machines/serverle/hardware-configuration.nix b/machines/serverle/hardware-configuration.nix index 5f3580e..83d838a 100644 --- a/machines/serverle/hardware-configuration.nix +++ b/machines/serverle/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { boot = { loader = { diff --git a/machines/serverle/network.nix b/machines/serverle/network.nix index 3caf12e..7501041 100644 --- a/machines/serverle/network.nix +++ b/machines/serverle/network.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { networking.firewall.allowedTCPPorts = [ 8080 # aria diff --git a/machines/serverle/services.nix b/machines/serverle/services.nix index fe9e50f..b01ecab 100644 --- a/machines/serverle/services.nix +++ b/machines/serverle/services.nix @@ -1,7 +1,7 @@ # Deployed services { config, ... }: let - secrets = config.sops.secrets; + inherit (config.sops) secrets; in { sops.secrets."acme/inwx" = { }; diff --git a/machines/serverle/system.nix b/machines/serverle/system.nix index e0076d2..0757216 100644 --- a/machines/serverle/system.nix +++ b/machines/serverle/system.nix @@ -1,5 +1,5 @@ # enabled system services -{ ... }: +_: { my.system = { avahi.enable = true; diff --git a/machines/thinkman/boot.nix b/machines/thinkman/boot.nix index 4c5304d..9364765 100644 --- a/machines/thinkman/boot.nix +++ b/machines/thinkman/boot.nix @@ -1,4 +1,4 @@ -{ ... }: +_: { boot = { loader = { diff --git a/machines/thinkman/hardware-configuration.nix b/machines/thinkman/hardware-configuration.nix index f50c8e3..5062fc4 100644 --- a/machines/thinkman/hardware-configuration.nix +++ b/machines/thinkman/hardware-configuration.nix @@ -1,4 +1,4 @@ -{ ... }: +_: let cpuFlavor = "intel"; in @@ -18,7 +18,7 @@ in }; firmware = { enable = true; - cpuFlavor = cpuFlavor; + inherit cpuFlavor; }; graphics.cpuFlavor = cpuFlavor; keychron.enable = true; diff --git a/machines/thinkman/network.nix b/machines/thinkman/network.nix index d6f7693..3b1666b 100644 --- a/machines/thinkman/network.nix +++ b/machines/thinkman/network.nix @@ -1,5 +1,5 @@ # network settings -{ ... }: +_: { # hotfixes for dns settings networking.extraHosts = diff --git a/machines/thinkman/profiles.nix b/machines/thinkman/profiles.nix index 67a0a7b..af6044f 100644 --- a/machines/thinkman/profiles.nix +++ b/machines/thinkman/profiles.nix @@ -1,5 +1,5 @@ # enabled profiles -{ ... }: +_: { my.profiles = { "3d-design".enable = true; diff --git a/machines/thinkman/services.nix b/machines/thinkman/services.nix index c69a17a..1f881b6 100644 --- a/machines/thinkman/services.nix +++ b/machines/thinkman/services.nix @@ -1,7 +1,7 @@ # Deployed services { config, ... }: let - secrets = config.sops.secrets; + inherit (config.sops) secrets; in { sops.secrets."borgbackup/password" = { }; diff --git a/machines/thinkman/system.nix b/machines/thinkman/system.nix index a1e06d8..2bd17dc 100644 --- a/machines/thinkman/system.nix +++ b/machines/thinkman/system.nix @@ -1,5 +1,5 @@ # enabled system services -{ ... }: +_: { my.system = { avahi.enable = true; diff --git a/modules/hardware/drive-monitor/default.nix b/modules/hardware/drive-monitor/default.nix index 09ab6f8..74f0717 100644 --- a/modules/hardware/drive-monitor/default.nix +++ b/modules/hardware/drive-monitor/default.nix @@ -7,7 +7,7 @@ in enable = mkEnableOption "drive-monitor configuration"; OnFailureMail = mkOption { - type = types.nullOr (types.str); + type = types.nullOr types.str; description = lib.mdDoc "Mail address where to send the error report"; default = null; example = "alarm@mail.com"; diff --git a/modules/services/alertmanager/default.nix b/modules/services/alertmanager/default.nix index c87a764..ae06ddb 100644 --- a/modules/services/alertmanager/default.nix +++ b/modules/services/alertmanager/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.alertmanager; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.alertmanager = with lib; { @@ -29,7 +29,7 @@ in alertmanager = { enable = true; listenAddress = "127.0.0.1"; - port = cfg.port; + inherit (cfg) port; configuration = import ./config.nix; webExternalUrl = "https://alerts.${domain}"; # fix issue: https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/4556 diff --git a/modules/services/aria2/default.nix b/modules/services/aria2/default.nix index 4a23281..511a09a 100644 --- a/modules/services/aria2/default.nix +++ b/modules/services/aria2/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.aria2; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.aria2 = with lib; { diff --git a/modules/services/backup/default.nix b/modules/services/backup/default.nix index 0e0f832..548d440 100644 --- a/modules/services/backup/default.nix +++ b/modules/services/backup/default.nix @@ -42,7 +42,7 @@ in default = false; }; OnFailureMail = mkOption { - type = types.nullOr (types.str); + type = types.nullOr types.str; description = lib.mdDoc "Mail address where to send the error report"; default = null; example = "alarm@mail.com"; @@ -122,7 +122,7 @@ in environment.BORG_RSH = "ssh -o 'StrictHostKeyChecking=no' -i ${cfg.sshKeyFile} -p ${toString cfg.sshPort}"; repo = "${cfg.sshUser}@${cfg.sshHost}:${config.networking.hostName}/"; - doInit = cfg.doInit; + inherit (cfg) doInit; compression = "auto,zstd"; postHook = '' diff --git a/modules/services/bazarr/default.nix b/modules/services/bazarr/default.nix index 4ca0c95..caa5bcc 100644 --- a/modules/services/bazarr/default.nix +++ b/modules/services/bazarr/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.bazarr; - domain = config.networking.domain; + inherit (config.networking) domain; port = 6767; in { diff --git a/modules/services/blocky/default.nix b/modules/services/blocky/default.nix index b2f9923..1842095 100644 --- a/modules/services/blocky/default.nix +++ b/modules/services/blocky/default.nix @@ -15,7 +15,7 @@ in }; settings = mkOption { - type = (pkgs.formats.json { }).type; + inherit (pkgs.formats.json { }) type; default = { }; example = literalExpression '' { ports.http = "8053" }; diff --git a/modules/services/dyndns/default.nix b/modules/services/dyndns/default.nix index 987d88c..550f7f8 100644 --- a/modules/services/dyndns/default.nix +++ b/modules/services/dyndns/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.dyndns; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.dyndns = with lib; { @@ -25,8 +25,7 @@ in services.ddclient = { enable = true; server = "dyndns.inwx.com"; - username = cfg.username; - passwordFile = cfg.passwordFile; + inherit (cfg) username passwordFile; domains = [ "serverle.${domain}" ]; ipv6 = true; }; diff --git a/modules/services/exportarr/default.nix b/modules/services/exportarr/default.nix index f6567ec..619b090 100644 --- a/modules/services/exportarr/default.nix +++ b/modules/services/exportarr/default.nix @@ -73,7 +73,7 @@ in }; ''; type = lib.types.attrsOf (lib.types.submodule ( - { ... }: { + _: { options = { # enable = lib.mkEnableOption "exportarr-${name}"; port = lib.mkOption { diff --git a/modules/services/freshrss/default.nix b/modules/services/freshrss/default.nix index 8ed38cf..b122e7f 100644 --- a/modules/services/freshrss/default.nix +++ b/modules/services/freshrss/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.freshrss; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.freshrss = with lib; { diff --git a/modules/services/gitea/default.nix b/modules/services/gitea/default.nix index 1326d67..5eba31f 100644 --- a/modules/services/gitea/default.nix +++ b/modules/services/gitea/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.gitea; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.gitea = with lib; { diff --git a/modules/services/grafana/default.nix b/modules/services/grafana/default.nix index afb1144..412041f 100644 --- a/modules/services/grafana/default.nix +++ b/modules/services/grafana/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.grafana; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.grafana = with lib; { diff --git a/modules/services/hedgedoc/default.nix b/modules/services/hedgedoc/default.nix index f7507bc..d9d95f3 100644 --- a/modules/services/hedgedoc/default.nix +++ b/modules/services/hedgedoc/default.nix @@ -2,14 +2,14 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.hedgedoc; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.hedgedoc = with lib; { enable = mkEnableOption "Hedgedoc Music Server"; settings = mkOption { - type = (pkgs.formats.json { }).type; + inherit (pkgs.formats.json { }) type; default = { }; example = { "LastFM.ApiKey" = "MYKEY"; diff --git a/modules/services/home-assistant/default.nix b/modules/services/home-assistant/default.nix index 2fe5a69..cb18e82 100644 --- a/modules/services/home-assistant/default.nix +++ b/modules/services/home-assistant/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.home-assistant; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.home-assistant = with lib; { @@ -83,14 +83,12 @@ in services.home-assistant = { enable = true; - package = cfg.package; + inherit (cfg) package; config = { homeassistant = { name = "Home"; - latitude = cfg.latitude; - longitude = cfg.longitude; - elevation = cfg.elevation; + inherit (cfg) latitude longitude elevation; unit_system = "metric"; time_zone = cfg.timezone; }; diff --git a/modules/services/homepage/default.nix b/modules/services/homepage/default.nix index 0f57c79..1793730 100644 --- a/modules/services/homepage/default.nix +++ b/modules/services/homepage/default.nix @@ -2,7 +2,7 @@ { config, lib, inputs, ... }: let cfg = config.my.services.homepage; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.homepage = with lib; { diff --git a/modules/services/homer/config.nix b/modules/services/homer/config.nix index 9828c86..9bb01af 100644 --- a/modules/services/homer/config.nix +++ b/modules/services/homer/config.nix @@ -113,14 +113,11 @@ apps); in { - name = cat.name; + inherit (cat) name; items = lib.forEach catApps (a: { - name = a.dashboard.name; + inherit (a.dashboard) name link type method; icon = lib.optionalString (a.dashboard.icon != null) "fas fa-${a.dashboard.icon}"; - url = a.dashboard.link; target = "_blank"; - type = a.dashboard.type; - method = a.dashboard.method; }); } ); diff --git a/modules/services/homer/default.nix b/modules/services/homer/default.nix index 5661cb6..77ba8ee 100644 --- a/modules/services/homer/default.nix +++ b/modules/services/homer/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.homer; - domain = config.networking.domain; + inherit (config.networking) domain; homeConfig = { title = "Dashboard"; diff --git a/modules/services/jellyfin/default.nix b/modules/services/jellyfin/default.nix index 771b934..1773f50 100644 --- a/modules/services/jellyfin/default.nix +++ b/modules/services/jellyfin/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.jellyfin; - domain = config.networking.domain; + inherit (config.networking) domain; port = 8096; # enable monitoring jellyfin-with-metrics = pkgs.jellyfin.overrideAttrs (attrs: { diff --git a/modules/services/jellyseerr/default.nix b/modules/services/jellyseerr/default.nix index ff72222..d62a793 100644 --- a/modules/services/jellyseerr/default.nix +++ b/modules/services/jellyseerr/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.jellyseerr; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.jellyseerr = with lib; { diff --git a/modules/services/loki/default.nix b/modules/services/loki/default.nix index 13e6b61..f3579aa 100644 --- a/modules/services/loki/default.nix +++ b/modules/services/loki/default.nix @@ -83,22 +83,21 @@ in type = "local"; local = { # having the "fake" directory is important, because loki is running in single-tenant mode - directory = (pkgs.writeTextDir "fake/loki-rules.yml" (builtins.toJSON { + directory = pkgs.writeTextDir "fake/loki-rules.yml" (builtins.toJSON { groups = [ { name = "alerting-rules"; rules = lib.mapAttrsToList (name: opts: { alert = name; - expr = opts.condition; + inherit (opts) condition labels; for = opts.time; - labels = opts.labels; annotations.description = opts.description; }) - (cfg.rules); + cfg.rules; } ]; - })); + }); }; }; diff --git a/modules/services/navidrome/default.nix b/modules/services/navidrome/default.nix index 06a4010..ab6bf45 100644 --- a/modules/services/navidrome/default.nix +++ b/modules/services/navidrome/default.nix @@ -2,14 +2,14 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.navidrome; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.navidrome = with lib; { enable = mkEnableOption "Navidrome Music Server"; settings = mkOption { - type = (pkgs.formats.json { }).type; + inherit (pkgs.formats.json { }) type; default = { EnableSharing = true; }; diff --git a/modules/services/nextcloud/default.nix b/modules/services/nextcloud/default.nix index 595963d..f0d0dae 100644 --- a/modules/services/nextcloud/default.nix +++ b/modules/services/nextcloud/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.nextcloud; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.nextcloud = with lib; { @@ -60,7 +60,7 @@ in config = { adminuser = cfg.admin; adminpassFile = cfg.passwordFile; - defaultPhoneRegion = cfg.defaultPhoneRegion; + inherit (cfg) defaultPhoneRegion; overwriteProtocol = "https"; # Nginx only allows SSL diff --git a/modules/services/nginx/default.nix b/modules/services/nginx/default.nix index 7130c43..a6baa25 100644 --- a/modules/services/nginx/default.nix +++ b/modules/services/nginx/default.nix @@ -250,8 +250,8 @@ in virtualHosts = let genAttrs' = values: f: lib.listToAttrs (map f values); - domain = config.networking.domain; - mkVHost = ({ subdomain, ... } @ args: lib.nameValuePair + inherit (config.networking) domain; + mkVHost = { subdomain, ... } @ args: lib.nameValuePair "${subdomain}.${domain}" (lib.foldl lib.recursiveUpdate { } [ # Base configuration @@ -309,7 +309,7 @@ in }; }) ]) - ); + ; in genAttrs' cfg.virtualHosts mkVHost; sso = { @@ -396,7 +396,7 @@ in # Use DNS wildcard certificate certs = let - domain = config.networking.domain; + inherit (config.networking) domain; in with pkgs; { diff --git a/modules/services/paperless/default.nix b/modules/services/paperless/default.nix index 87f51e5..bee4072 100644 --- a/modules/services/paperless/default.nix +++ b/modules/services/paperless/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.paperless; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.paperless = with lib; { diff --git a/modules/services/passworts/default.nix b/modules/services/passworts/default.nix index e689642..9373ea4 100644 --- a/modules/services/passworts/default.nix +++ b/modules/services/passworts/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.passworts; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.passworts = with lib; { diff --git a/modules/services/photoprism/default.nix b/modules/services/photoprism/default.nix index e90ed1d..e295d9b 100644 --- a/modules/services/photoprism/default.nix +++ b/modules/services/photoprism/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.photoprism; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.photoprism = { @@ -49,10 +49,7 @@ in config = lib.mkIf cfg.enable { services.photoprism = { enable = true; - passwordFile = cfg.passwordFile; - port = cfg.port; - originalsPath = cfg.originalsPath; - settings = cfg.settings; + inherit (cfg) passwordFile port originalsPath settings; }; my.services.nginx.virtualHosts = [ diff --git a/modules/services/prometheus/default.nix b/modules/services/prometheus/default.nix index 770a1a4..59514cb 100644 --- a/modules/services/prometheus/default.nix +++ b/modules/services/prometheus/default.nix @@ -2,7 +2,7 @@ { config, lib, pkgs, ... }: let cfg = config.my.services.prometheus; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.prometheus = with lib; { @@ -100,13 +100,13 @@ in alert = name; expr = opts.condition; for = opts.time; - labels = opts.labels; + inherit (opts) labels; annotations = { - description = opts.description; + inherit (opts) description; grafana = lib.optionalString config.services.grafana.enable "https://visualization.${domain}"; }; }) - (cfg.rules); + cfg.rules; } ]; })) diff --git a/modules/services/promtail/default.nix b/modules/services/promtail/default.nix index 6896463..2ec2009 100644 --- a/modules/services/promtail/default.nix +++ b/modules/services/promtail/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.promtail; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.promtail = with lib; { diff --git a/modules/services/prowlarr/default.nix b/modules/services/prowlarr/default.nix index 0689277..aea4ad1 100644 --- a/modules/services/prowlarr/default.nix +++ b/modules/services/prowlarr/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.prowlarr; - domain = config.networking.domain; + inherit (config.networking) domain; port = 9696; in { @@ -46,7 +46,7 @@ in my.services.exportarr.prowlarr = { port = port + 1; url = "http://127.0.0.1:${toString port}"; - apiKeyFile = cfg.apiKeyFile; + inherit (cfg) apiKeyFile; }; services.prometheus.scrapeConfigs = [ diff --git a/modules/services/radarr/default.nix b/modules/services/radarr/default.nix index 57d4440..81c7d16 100644 --- a/modules/services/radarr/default.nix +++ b/modules/services/radarr/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.radarr; - domain = config.networking.domain; + inherit (config.networking) domain; port = 7878; in { @@ -36,7 +36,7 @@ in my.services.exportarr.radarr = { port = port + 1; url = "http://127.0.0.1:${toString port}"; - apiKeyFile = cfg.apiKeyFile; + inherit (cfg) apiKeyFile; }; services.prometheus.scrapeConfigs = [ diff --git a/modules/services/sonarr/default.nix b/modules/services/sonarr/default.nix index a1736b8..988081e 100644 --- a/modules/services/sonarr/default.nix +++ b/modules/services/sonarr/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.sonarr; - domain = config.networking.domain; + inherit (config.networking) domain; port = 8989; in { @@ -36,7 +36,7 @@ in my.services.exportarr.sonarr = { port = port + 1; url = "http://127.0.0.1:${toString port}"; - apiKeyFile = cfg.apiKeyFile; + inherit (cfg) apiKeyFile; }; services.prometheus.scrapeConfigs = [ diff --git a/modules/services/tandoor-recipes/default.nix b/modules/services/tandoor-recipes/default.nix index e8a80d7..436f9ba 100644 --- a/modules/services/tandoor-recipes/default.nix +++ b/modules/services/tandoor-recipes/default.nix @@ -2,7 +2,7 @@ { config, lib, ... }: let cfg = config.my.services.tandoor-recipes; - domain = config.networking.domain; + inherit (config.networking) domain; in { options.my.services.tandoor-recipes = with lib; { @@ -18,7 +18,7 @@ in config = lib.mkIf cfg.enable { services.tandoor-recipes = { enable = true; - port = cfg.port; + inherit (cfg) port; }; # Proxy to Tandoor-Recipes diff --git a/pkgs/grafana-dashboards/default.nix b/pkgs/grafana-dashboards/default.nix index 5a04742..595f778 100644 --- a/pkgs/grafana-dashboards/default.nix +++ b/pkgs/grafana-dashboards/default.nix @@ -13,7 +13,7 @@ let inherit (args) version; src = fetchurl { url = "https://grafana.com/api/dashboards/${toString args.id}/revisions/${args.version}/download"; - hash = args.hash; + inherit (args) hash; }; dontUnpack = true; installPhase = ''