diff --git a/dot_config/flake/flake.lock b/dot_config/flake/flake.lock index 24f75d9..f6a3a76 100644 --- a/dot_config/flake/flake.lock +++ b/dot_config/flake/flake.lock @@ -512,17 +512,17 @@ ] }, "locked": { - "lastModified": 1764482797, - "narHash": "sha256-ynV90KoBrPe38YFlKAHtPFk4Ee3IANUsIFGxRaq7H/s=", + "lastModified": 1764045583, + "narHash": "sha256-W24ReyRrhOKTKIsuAMkY5hnVlCufGoONM79sjUoyQkk=", "owner": "outfoxxed", "repo": "quickshell", - "rev": "d24e8e9736287d01ee73ef9d573d2bc316a62d5c", + "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", "type": "github" }, "original": { "owner": "outfoxxed", "repo": "quickshell", - "rev": "d24e8e9736287d01ee73ef9d573d2bc316a62d5c", + "rev": "e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3", "type": "github" } }, diff --git a/dot_config/flake/flake.nix b/dot_config/flake/flake.nix index a39e602..76cbc2e 100644 --- a/dot_config/flake/flake.nix +++ b/dot_config/flake/flake.nix @@ -35,7 +35,7 @@ }; quickshell = { - url = "github:outfoxxed/quickshell/d24e8e9736287d01ee73ef9d573d2bc316a62d5c"; + url = "github:outfoxxed/quickshell/e9bad67619ee9937a1bbecfc6ad3b4231d2ecdc3"; inputs.nixpkgs.follows = "nixpkgs-unstable"; }; diff --git a/dot_config/flake/machines/saffron/configuration.nix b/dot_config/flake/machines/saffron/configuration.nix index 6232a9e..df6038d 100644 --- a/dot_config/flake/machines/saffron/configuration.nix +++ b/dot_config/flake/machines/saffron/configuration.nix @@ -31,7 +31,7 @@ }; networking.hostName = "saffron"; # Define your hostname. - networking.firewall.allowedTCPPorts = [443 80]; + networking.firewall.allowedTCPPorts = [ 443 ]; # Caddy reverse proxy with DNS challenge services.caddy = { @@ -49,84 +49,6 @@ reverse_proxy serenity.pizzly-bortle.ts.net:5600 ''; }; - virtualHosts."search.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:6000 - ''; - }; - virtualHosts."monitor.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:8090 - ''; - }; - virtualHosts."gitforge.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:3000 - ''; - }; - virtualHosts."immich.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:2283 - ''; - }; - virtualHosts."nextcloud.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:8100 - ''; - }; - # virtualHosts."documentserver.mayoff.ca" = { - # extraConfig = '' - # tls { - # dns cloudflare {env.CLOUDFLARE_API_TOKEN} - # } - # reverse_proxy serenity.pizzly-bortle.ts.net:8101 - # ''; - # }; - virtualHosts."chat.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:8009 - ''; - }; - virtualHosts."media.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy serenity.pizzly-bortle.ts.net:8096 - ''; - }; - virtualHosts."homeassistant.mayoff.ca" = { - extraConfig = '' - tls { - dns cloudflare {env.CLOUDFLARE_API_TOKEN} - } - reverse_proxy homeassistant.pizzly-bortle.ts.net:8123 { - header_up Host {upstream_hostport} - header_up X-Real-IP {remote_host} - header_up X-Forwarded-For {remote_host} - header_up X-Forwarded-Proto {scheme} - header_up X-Forwarded-Host {host} - } - ''; - }; }; # Set your time zone.