From da69a21100e2494510efd8e445fe465f7f3996bd Mon Sep 17 00:00:00 2001 From: soraefir Date: Fri, 17 Nov 2023 09:55:29 +0100 Subject: [PATCH] Fix overlays --- modules/home/gui/games/default.nix | 2 +- .../system/network/wireguard/default.nix | 38 +++++++++---------- systems/avalon/server/docker/authentik.nix | 4 +- systems/avalon/server/docker/cloud.nix | 25 +++++++----- 4 files changed, 37 insertions(+), 32 deletions(-) diff --git a/modules/home/gui/games/default.nix b/modules/home/gui/games/default.nix index 798ebf9..8bfc7e3 100644 --- a/modules/home/gui/games/default.nix +++ b/modules/home/gui/games/default.nix @@ -5,7 +5,7 @@ config = lib.mkIf (config.homecfg.make.game) { home.packages = with pkgs; [ - # custom.simc + # custom.simc #games steam diff --git a/modules/nixos/system/network/wireguard/default.nix b/modules/nixos/system/network/wireguard/default.nix index 0fe9bef..549fe11 100644 --- a/modules/nixos/system/network/wireguard/default.nix +++ b/modules/nixos/system/network/wireguard/default.nix @@ -1,19 +1,19 @@ -{ config, ... }: { - networking.wireguard = { - enable = true; - interfaces = { - wg0 = { - ips = [ config.hostcfg.net.wg.ip4 config.hostcfg.net.wg.ip6 ]; - privateKeyFile = config.hostcfg.net.wg.pk; - listenPort = 1515; - mtu = 1340; - peers = [{ - allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ]; - endpoint = "vpn.helcel.net:1515"; - publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q="; - persistentKeepalive = 30; - }]; - }; - }; - }; -} +{ config, ... }: { + networking.wireguard = { + enable = true; + interfaces = { + wg0 = { + ips = [ config.hostcfg.net.wg.ip4 config.hostcfg.net.wg.ip6 ]; + privateKeyFile = config.hostcfg.net.wg.pk; + listenPort = 1515; + mtu = 1340; + peers = [{ + allowedIPs = [ "10.10.1.0/24" "fd10:10:10::0/64" ]; + endpoint = "vpn.helcel.net:1515"; + publicKey = "NFBJvYXZC+bd62jhrKnM7/pugidWhgR6+C5qIiUiq3Q="; + persistentKeepalive = 30; + }]; + }; + }; + }; +} diff --git a/systems/avalon/server/docker/authentik.nix b/systems/avalon/server/docker/authentik.nix index 82ec055..f3f6352 100644 --- a/systems/avalon/server/docker/authentik.nix +++ b/systems/avalon/server/docker/authentik.nix @@ -54,7 +54,7 @@ in { "AUTHENTIK_POSTGRESQL__HOST" = "auth_postgresql"; "AUTHENTIK_POSTGRESQL__USER" = "authentik"; "AUTHENTIK_POSTGRESQL__NAME" = "authentik"; - "AUTHENTIK_POSTGRESQL__PASSWORD" ="AUTHENTIK_DB_PASSWORD"; + "AUTHENTIK_POSTGRESQL__PASSWORD" = "AUTHENTIK_DB_PASSWORD"; "AUTHENTIK_SECRET_KEY" = "AUTHENTIK_SECRET_KEY"; "AUTHENTIK_EMAIL__HOST" = "${MAIL_SERVER_DOMAIN}"; "AUTHENTIK_EMAIL__PORT" = "587"; @@ -94,7 +94,7 @@ in { "AUTHENTIK_POSTGRESQL__HOST" = "auth_postgresql"; "AUTHENTIK_POSTGRESQL__USER" = "authentik"; "AUTHENTIK_POSTGRESQL__NAME" = "authentik"; - "AUTHENTIK_POSTGRESQL__PASSWORD" ="AUTHENTIK_DB_PASSWORD"; + "AUTHENTIK_POSTGRESQL__PASSWORD" = "AUTHENTIK_DB_PASSWORD"; "AUTHENTIK_SECRET_KEY" = "AUTHENTIK_SECRET_KEY"; }; labels = { "traefik.enable" = "false"; }; diff --git a/systems/avalon/server/docker/cloud.nix b/systems/avalon/server/docker/cloud.nix index bebc7dc..2e9e9c8 100644 --- a/systems/avalon/server/docker/cloud.nix +++ b/systems/avalon/server/docker/cloud.nix @@ -24,7 +24,7 @@ in { container_name = "cloud"; restart = "unless-stopped"; networks = [ "external" ]; - volumes = [ + volumes = [ "${DATA_PATH}/data/nextcloud:/var/www/html" "${DATA_PATH}/data/music:/media/music" "${DATA_PATH}/data/video:/media/video" @@ -36,13 +36,18 @@ in { "traefik.http.routers.nextcloud.entrypoints" = "web-secure"; "traefik.http.routers.nextcloud.rule" = "Host(`cloud.${HOST_DOMAIN}`)"; "traefik.http.routers.nextcloud.tls" = "true"; - "traefik.http.routers.nextcloud.middlewares" = "sts_headers,nextcloud-caldav"; + "traefik.http.routers.nextcloud.middlewares" = + "sts_headers,nextcloud-caldav"; - "traefik.http.middlewares.nextcloud-caldav.redirectregex.permanent" = "true"; - "traefik.http.middlewares.nextcloud-caldav.redirectregex.regex" = "^https://(.*)/.well-known/(card|cal)dav"; - "traefik.http.middlewares.nextcloud-caldav.redirectregex.replacement" = "https://$\${1}/remote.php/dav/"; + "traefik.http.middlewares.nextcloud-caldav.redirectregex.permanent" = + "true"; + "traefik.http.middlewares.nextcloud-caldav.redirectregex.regex" = + "^https://(.*)/.well-known/(card|cal)dav"; + "traefik.http.middlewares.nextcloud-caldav.redirectregex.replacement" = + "https://$\${1}/remote.php/dav/"; "traefik.http.middlewares.sts_headers.headers.stsSeconds" = "15552000"; - "traefik.http.middlewares.sts_headers.headers.stsIncludeSubdomains" = "true"; + "traefik.http.middlewares.sts_headers.headers.stsIncludeSubdomains" = + "true"; }; }; @@ -79,11 +84,11 @@ in { container_name = "etherpad"; restart = "unless-stopped"; networks = [ "external" ]; - volumes = [ + volumes = [ "${DATA_PATH}/ether/etherpad/data:/opt/etherpad-lite/var" "/${DATA_PATH}/ether/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt" ]; - environment = { + environment = { NODE_ENV = "production"; TITLE = "Helcel-Pad"; DB_TYPE = "mysql"; @@ -112,11 +117,11 @@ in { container_name = "ethercalc"; restart = "unless-stopped"; networks = [ "external" "internal" ]; - volumes = [ + volumes = [ "${DATA_PATH}/ether/etherpad/data:/opt/etherpad-lite/var" "/${DATA_PATH}/ether/etherpad/APIKEY.txt:/opt/etherpad-lite/APIKEY.txt" ]; - environment = { + environment = { NODE_ENV = "production"; TITLE = "Helcel-Calc"; REDIS_PORT_6379_TCP_ADDR = "redis";