From cdd9dac3550f4a994c7ce90f87e11f64a3f07990 Mon Sep 17 00:00:00 2001 From: Danilo Reyes Date: Wed, 22 Jan 2025 16:38:15 -0600 Subject: [PATCH] some formatting --- hosts/workstation/configuration.nix | 2 +- modules/scripts/download.nix | 2 +- modules/scripts/stream-dl.nix | 2 +- modules/scripts/update-dns.nix | 2 +- modules/servers/atticd.nix | 4 +--- modules/servers/audiobookshelf.nix | 18 +----------------- modules/servers/bazarr.nix | 2 +- modules/servers/flame.nix | 4 ++-- modules/servers/homepage.nix | 2 +- modules/servers/jellyfin.nix | 2 +- modules/servers/kavita.nix | 2 +- modules/servers/lidarr.nix | 4 +--- modules/servers/maloja.nix | 4 +--- modules/servers/mealie.nix | 2 +- modules/servers/metube.nix | 4 +--- modules/servers/microbin.nix | 2 +- modules/servers/multi-scrobbler.nix | 4 +--- modules/servers/nix-serve.nix | 2 +- modules/servers/ombi.nix | 6 +++--- modules/servers/prowlarr.nix | 2 +- modules/servers/radarr.nix | 2 +- modules/servers/ryot.nix | 4 +--- modules/servers/shiori.nix | 2 +- modules/servers/sonarr.nix | 4 ++-- modules/servers/vaultwarden.nix | 2 +- 25 files changed, 29 insertions(+), 57 deletions(-) diff --git a/hosts/workstation/configuration.nix b/hosts/workstation/configuration.nix index 0ef0223..64ddf18 100644 --- a/hosts/workstation/configuration.nix +++ b/hosts/workstation/configuration.nix @@ -1,4 +1,4 @@ -{ inputs, pkgs, ... }: +{ pkgs, ... }: { imports = [ ./hardware-configuration.nix diff --git a/modules/scripts/download.nix b/modules/scripts/download.nix index c6ffb56..1cd17da 100644 --- a/modules/scripts/download.nix +++ b/modules/scripts/download.nix @@ -13,7 +13,7 @@ }; config = let - download = inputs.jawz-scripts.packages.x86_64-linux.download; + inherit (inputs.jawz-scripts.packages.x86_64-linux) download; in { home-manager.users.jawz = { diff --git a/modules/scripts/stream-dl.nix b/modules/scripts/stream-dl.nix index 75b4c1f..e02064f 100644 --- a/modules/scripts/stream-dl.nix +++ b/modules/scripts/stream-dl.nix @@ -10,7 +10,7 @@ options.my.units.stream-dl.enable = lib.mkEnableOption "enable"; config = let - stream-dl = inputs.jawz-scripts.packages.x86_64-linux.stream-dl; + inherit (inputs.jawz-scripts.packages.x86_64-linux) stream-dl; in { systemd.user = lib.mkIf config.my.units.stream-dl.enable { diff --git a/modules/scripts/update-dns.nix b/modules/scripts/update-dns.nix index 4bb3f90..5eb3b60 100644 --- a/modules/scripts/update-dns.nix +++ b/modules/scripts/update-dns.nix @@ -36,7 +36,7 @@ description = "Updates the IP of all my domains"; package = let - update-dns = inputs.jawz-scripts.packages.x86_64-linux.update-dns; + inherit (inputs.jawz-scripts.packages.x86_64-linux) update-dns; in pkgs.writeScriptBin "update-dns" '' #!/usr/bin/env nix-shell diff --git a/modules/servers/atticd.nix b/modules/servers/atticd.nix index e4b1ec5..a608e62 100644 --- a/modules/servers/atticd.nix +++ b/modules/servers/atticd.nix @@ -30,9 +30,7 @@ in }; }; }; - nginx.virtualHosts."cache.rotehaare.art" = lib.mkIf cfg.enableProxy ( - setup.proxyReverseFix cfg // { } - ); + nginx.virtualHosts."cache.rotehaare.art" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; }; } diff --git a/modules/servers/audiobookshelf.nix b/modules/servers/audiobookshelf.nix index 0b1b424..bfc5db9 100644 --- a/modules/servers/audiobookshelf.nix +++ b/modules/servers/audiobookshelf.nix @@ -6,7 +6,6 @@ in { options.my.servers.audiobookshelf = setup.mkOptions "audiobookshelf" "audiobooks" 5687; config = { - my.servers.audiobookshelf.ip = "127.0.0.3"; services = { audiobookshelf = lib.mkIf cfg.enable { inherit (cfg) port; @@ -14,22 +13,7 @@ in host = cfg.ip; group = "piracy"; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( - setup.proxy { - "/" = { - proxyPass = cfg.local; - extraConfig = '' - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_set_header X-Forwarded-Proto $scheme; - proxy_set_header Host $host; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection "upgrade"; - proxy_http_version 1.1; - proxy_redirect http:// https://; - ''; - }; - } - ); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; }; } diff --git a/modules/servers/bazarr.nix b/modules/servers/bazarr.nix index abb39d0..8d4821f 100644 --- a/modules/servers/bazarr.nix +++ b/modules/servers/bazarr.nix @@ -12,7 +12,7 @@ in enable = true; group = "piracy"; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/flame.nix b/modules/servers/flame.nix index be3a905..f18df00 100644 --- a/modules/servers/flame.nix +++ b/modules/servers/flame.nix @@ -47,8 +47,8 @@ in }; services.nginx = { virtualHosts = lib.mkIf (cfg.enableProxy || cfgS.enableProxy) { - "${cfg.host}" = setup.proxyReverse cfg // { }; - "${cfgS.host}" = setup.proxyReverse cfgS // { }; + "${cfg.host}" = setup.proxyReverse cfg; + "${cfgS.host}" = setup.proxyReverse cfgS; }; }; }; diff --git a/modules/servers/homepage.nix b/modules/servers/homepage.nix index a32ae7e..5786ee4 100644 --- a/modules/servers/homepage.nix +++ b/modules/servers/homepage.nix @@ -22,7 +22,7 @@ in |> builtins.filter (file: builtins.match ".*\\.nix" file != null) |> map (file: import ./homepage/bookmarks/${file}); }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/jellyfin.nix b/modules/servers/jellyfin.nix index fedfc1a..a140099 100644 --- a/modules/servers/jellyfin.nix +++ b/modules/servers/jellyfin.nix @@ -7,7 +7,7 @@ }: let cfg = config.my.servers.jellyfin; - sub-sync = inputs.jawz-scripts.packages.x86_64-linux.sub-sync; + inherit (inputs.jawz-scripts.packages.x86_64-linux) sub-sync; sub-sync-path = [ pkgs.nix pkgs.bash diff --git a/modules/servers/kavita.nix b/modules/servers/kavita.nix index 06ee277..30e64e0 100644 --- a/modules/servers/kavita.nix +++ b/modules/servers/kavita.nix @@ -24,7 +24,7 @@ in enable = true; tokenKeyFile = config.sops.secrets.kavita-token.path; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/lidarr.nix b/modules/servers/lidarr.nix index a3990b8..8dc7a13 100644 --- a/modules/servers/lidarr.nix +++ b/modules/servers/lidarr.nix @@ -29,8 +29,6 @@ in "--network=host" ]; }; - services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( - setup.proxyReverseFix cfg // { } - ); + services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; } diff --git a/modules/servers/maloja.nix b/modules/servers/maloja.nix index 42859b8..6b49c11 100644 --- a/modules/servers/maloja.nix +++ b/modules/servers/maloja.nix @@ -22,8 +22,6 @@ in }; volumes = [ "${config.my.containerData}/maloja:/mljdata" ]; }; - services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( - setup.proxyReverse cfg // { } - ); + services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; } diff --git a/modules/servers/mealie.nix b/modules/servers/mealie.nix index fe8123e..8ed834f 100644 --- a/modules/servers/mealie.nix +++ b/modules/servers/mealie.nix @@ -27,7 +27,7 @@ in }; credentialsFile = config.sops.secrets.mealie.path; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/metube.nix b/modules/servers/metube.nix index e172421..d7e4dcf 100644 --- a/modules/servers/metube.nix +++ b/modules/servers/metube.nix @@ -21,8 +21,6 @@ in PGID = toString config.users.groups.piracy.gid; }; }; - services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( - setup.proxyReverse cfg // { } - ); + services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; } diff --git a/modules/servers/microbin.nix b/modules/servers/microbin.nix index 7cc65c5..0c398a5 100644 --- a/modules/servers/microbin.nix +++ b/modules/servers/microbin.nix @@ -20,7 +20,7 @@ in MICROBIN_ENCRYPTION_SERVER_SIDE = true; }; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/multi-scrobbler.nix b/modules/servers/multi-scrobbler.nix index c428575..88bec71 100644 --- a/modules/servers/multi-scrobbler.nix +++ b/modules/servers/multi-scrobbler.nix @@ -23,8 +23,6 @@ in }; volumes = [ "${config.my.containerData}/multi-scrobbler:/config" ]; }; - services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( - setup.proxyReverse cfg // { } - ); + services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; } diff --git a/modules/servers/nix-serve.nix b/modules/servers/nix-serve.nix index 341bbd8..1dc5793 100644 --- a/modules/servers/nix-serve.nix +++ b/modules/servers/nix-serve.nix @@ -20,7 +20,7 @@ in inherit (cfg) port; secretKeyFile = config.sops.secrets."private_cache_keys/miniserver".path; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/ombi.nix b/modules/servers/ombi.nix index cf7524e..115413b 100644 --- a/modules/servers/ombi.nix +++ b/modules/servers/ombi.nix @@ -9,10 +9,10 @@ in services = { ombi = lib.mkIf cfg.enable { enable = true; - port = cfg.port; - openFirewall = (!cfg.isLocal); + inherit (cfg) port; + openFirewall = !cfg.isLocal; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; }; } diff --git a/modules/servers/prowlarr.nix b/modules/servers/prowlarr.nix index bd21f43..a87431b 100644 --- a/modules/servers/prowlarr.nix +++ b/modules/servers/prowlarr.nix @@ -23,7 +23,7 @@ in package = pkgs.nur.repos.xddxdd.flaresolverr-21hsmw; openFirewall = true; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; }; } diff --git a/modules/servers/radarr.nix b/modules/servers/radarr.nix index 90a594f..9afe422 100644 --- a/modules/servers/radarr.nix +++ b/modules/servers/radarr.nix @@ -12,7 +12,7 @@ in enable = true; group = "piracy"; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; }; } diff --git a/modules/servers/ryot.nix b/modules/servers/ryot.nix index e72e24a..3d975a2 100644 --- a/modules/servers/ryot.nix +++ b/modules/servers/ryot.nix @@ -19,8 +19,6 @@ in }; volumes = [ "${config.my.postgresSocket}:${config.my.postgresSocket}" ]; }; - services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy ( - setup.proxyReverse cfg // { } - ); + services.nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; } diff --git a/modules/servers/shiori.nix b/modules/servers/shiori.nix index 4a5e0fb..deb1102 100644 --- a/modules/servers/shiori.nix +++ b/modules/servers/shiori.nix @@ -15,7 +15,7 @@ in environmentFile = config.sops.secrets.shiori.path; databaseUrl = "postgres:///shiori?host=${config.my.postgresSocket}"; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; } diff --git a/modules/servers/sonarr.nix b/modules/servers/sonarr.nix index c0b2bd7..35b9405 100644 --- a/modules/servers/sonarr.nix +++ b/modules/servers/sonarr.nix @@ -10,9 +10,9 @@ in sonarr = lib.mkIf cfg.enable { enable = true; group = "piracy"; - openFirewall = (!cfg.isLocal); + openFirewall = !cfg.isLocal; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverseFix cfg); }; }; } diff --git a/modules/servers/vaultwarden.nix b/modules/servers/vaultwarden.nix index 61df3d9..bd2b51c 100644 --- a/modules/servers/vaultwarden.nix +++ b/modules/servers/vaultwarden.nix @@ -31,7 +31,7 @@ in LOG_LEVEL = "warn"; }; }; - nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg // { }); + nginx.virtualHosts."${cfg.host}" = lib.mkIf cfg.enableProxy (setup.proxyReverse cfg); }; }; }