diff --git a/hosts/cirrus/nextcloud-proxy.nix b/hosts/cirrus/nextcloud-proxy.nix index 60aee49..7a4fa67 100644 --- a/hosts/cirrus/nextcloud-proxy.nix +++ b/hosts/cirrus/nextcloud-proxy.nix @@ -21,32 +21,32 @@ enableACME = true; forceSSL = true; extraConfig = '' - client_max_body_size 512M; + client_max_body_size 512M; ''; locations = { "/" = { - proxyPass = "http://10.34.45.100:8080"; - }; - "/well-known/carddav" = { - return = "301 $scheme://$host/remote.php/dav"; - }; - "/well-known/caldav" = { - return = "301 $scheme://$host/remote.php/dav"; + proxyPass = "http://10.34.45.100:8080"; + }; + "/well-known/carddav" = { + return = "301 $scheme://$host/remote.php/dav"; + }; + "/well-known/caldav" = { + return = "301 $scheme://$host/remote.php/dav"; + }; }; }; - }; - "music.oxapentane.com" = { - enableACME = true; - forceSSL = true; - extraConfig = '' - client_max_body_size 32M; - ''; - locations = { - "/" = { - proxyPass = "http://10.34.45.101:4533"; + "music.oxapentane.com" = { + enableACME = true; + forceSSL = true; + extraConfig = '' + client_max_body_size 32M; + ''; + locations = { + "/" = { + proxyPass = "http://10.34.45.101:4533"; + }; }; }; }; -}; } diff --git a/hosts/dishwasher/mcvm-network.nix b/hosts/dishwasher/mcvm-network.nix index 22114b3..9f5ce6c 100644 --- a/hosts/dishwasher/mcvm-network.nix +++ b/hosts/dishwasher/mcvm-network.nix @@ -11,12 +11,14 @@ DHCPServer = false; IPv6SendRA = true; }; - addresses = [{ - addressConfig.Address = "10.99.99.1/24"; - } - { - addressConfig.Address = "fd12:3456:789a::1/64"; - }]; + addresses = [ + { + addressConfig.Address = "10.99.99.1/24"; + } + { + addressConfig.Address = "fd12:3456:789a::1/64"; + } + ]; ipv6Prefixes = [{ ipv6PrefixConfig.Prefix = "fd12:3456:789a::/64"; }]; diff --git a/modules/science.nix b/modules/science.nix index 2af95ff..b6ce66b 100644 --- a/modules/science.nix +++ b/modules/science.nix @@ -1,5 +1,4 @@ { config, pkgs, ... }: - { environment.systemPackages = with pkgs; [ (rWrapper.override {