diff --git a/hosts/hitsugibune/matrix.nix b/hosts/hitsugibune/matrix.nix index 75b35d6..4204b66 100644 --- a/hosts/hitsugibune/matrix.nix +++ b/hosts/hitsugibune/matrix.nix @@ -14,12 +14,15 @@ return 200 '${builtins.toJSON data}'; ''; turn = config.services.coturn; - mautrix_whatsapp_old = import (pkgs.fetchFromGitHub { - owner = "NixOS"; - repo = "nixpkgs"; - rev = "88e8a4036877dc2d328fd3e7cb4e732eb037e49c"; - sha256 = "sha256-Rn+hvrEG0cK3pq9bGq0md0nDwOHR5p/awZeiQ12JDTs="; - }) {}; + mautrix_whatsapp_old = + import (pkgs.fetchFromGitHub { + owner = "NixOS"; + repo = "nixpkgs"; + rev = "88e8a4036877dc2d328fd3e7cb4e732eb037e49c"; + sha256 = "sha256-Rn+hvrEG0cK3pq9bGq0md0nDwOHR5p/awZeiQ12JDTs="; + }) { + inherit (pkgs) system; + }; in { age.secrets.matrix = { file = ../../secrets/matrix.age; @@ -204,8 +207,8 @@ in { settings.turn_user_lifetime = "1h"; }; - # WARN: Remove once mautrix is updated - nixpkgs.config.permittedInsecurePackages = [ + # WARN: Remove once mautrix whatsapp is updated + mautrix_whatsapp_old.config.permittedInsecurePackages = [ "olm-3.2.16" ]; diff --git a/hosts/saberofxebec/configuration.nix b/hosts/saberofxebec/configuration.nix index 5d46453..7de217f 100644 --- a/hosts/saberofxebec/configuration.nix +++ b/hosts/saberofxebec/configuration.nix @@ -281,10 +281,10 @@ in { ''; virtualHosts."jellyseer.saberofxebec" = { extraConfig = '' - reverse_proxy :5055 - tls internal + reverse_proxy :5055 + tls internal ''; - serverAliases = [ "jellyseerr.saberofxebec" ]; + serverAliases = ["jellyseerr.saberofxebec"]; }; virtualHosts."homarr.saberofxebec".extraConfig = '' reverse_proxy :7575 diff --git a/hosts/saberofxebec/homebridge.nix b/hosts/saberofxebec/homebridge.nix index 0b382d8..c08bcca 100644 --- a/hosts/saberofxebec/homebridge.nix +++ b/hosts/saberofxebec/homebridge.nix @@ -1,7 +1,7 @@ {config, ...}: let accessoryStart = 20000; accessoryEnd = 20200; - in { +in { services.homebridge = { enable = true; openFirewall = true; @@ -14,10 +14,14 @@ }; # 50202 LG Subbridge - networking.firewall.allowedTCPPorts = [ config.services.homebridge.settings.bridge.port 50202 ]; - networking.firewall.allowedTCPPortRanges = [ {from = accessoryStart; to = accessoryEnd;} ]; - networking.firewall.allowedUDPPorts = [ 5353 ]; # mDNS / Bonjour - + networking.firewall.allowedTCPPorts = [config.services.homebridge.settings.bridge.port 50202]; + networking.firewall.allowedTCPPortRanges = [ + { + from = accessoryStart; + to = accessoryEnd; + } + ]; + networking.firewall.allowedUDPPorts = [5353]; # mDNS / Bonjour services.caddy = { enable = true; @@ -28,18 +32,18 @@ }; security.sudo = { - enable = true; + enable = true; - extraRules = [ - { - users = [ "homebridge" ]; - commands = [ - { - command = "ALL"; - options = [ "NOPASSWD" ]; - } - ]; - } - ]; + extraRules = [ + { + users = ["homebridge"]; + commands = [ + { + command = "ALL"; + options = ["NOPASSWD"]; + } + ]; + } + ]; }; }