diff options
| -rw-r--r-- | flake.lock | 55 | ||||
| -rw-r--r-- | flake.nix | 2 | ||||
| -rw-r--r-- | hosts/p-body/nginx.nix | 4 |
3 files changed, 44 insertions, 17 deletions
@@ -221,19 +221,17 @@ }, "getchoo-website": { "inputs": { - "nixpkgs": [ - "nixpkgsUnstable" - ], + "nixpkgs": "nixpkgs", "pre-commit-hooks": [ "pre-commit-hooks" ] }, "locked": { - "lastModified": 1684228639, - "narHash": "sha256-kOQIvjFSqAR7hGB5qNx7FDMpIcydFExlxQ6lEIsATI4=", + "lastModified": 1684237001, + "narHash": "sha256-9pOpquN8IBSI83s1Ahh7Vbi0hTL+TLQfsLsX81x4F3g=", "owner": "getchoo", "repo": "getchoo.github.io", - "rev": "4b2f271406f4f32dee01d0ecb7d8528e9eae1c1d", + "rev": "119d2a208944f7b4d37cf1afd275dbd6fa7cb0b0", "type": "github" }, "original": { @@ -309,9 +307,7 @@ ], "haskell-flake": "haskell-flake", "nix-darwin": "nix-darwin", - "nixpkgs": [ - "nixpkgsUnstable" - ], + "nixpkgs": "nixpkgs_2", "pre-commit-hooks-nix": [ "pre-commit-hooks" ] @@ -495,16 +491,16 @@ }, "nixpkgs": { "locked": { - "lastModified": 1684130981, - "narHash": "sha256-5IPp/rUAOogega5xuRoxcpfkwlGDAyWdizL0Tp2GA4s=", + "lastModified": 1684139381, + "narHash": "sha256-YPLMeYE+UzxxP0qbkBzv3RBDvyGR5I4d7v2n8dI3+fY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d41eea2839de7de0f2cbe4aa90fde5db8afcd30a", + "rev": "17a689596b72d1906883484838eb1aaf51ab8001", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-22.11", + "ref": "nixos-unstable", "type": "indirect" } }, @@ -523,6 +519,37 @@ "type": "indirect" } }, + "nixpkgs_2": { + "locked": { + "lastModified": 1684139381, + "narHash": "sha256-YPLMeYE+UzxxP0qbkBzv3RBDvyGR5I4d7v2n8dI3+fY=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "17a689596b72d1906883484838eb1aaf51ab8001", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { + "locked": { + "lastModified": 1684130981, + "narHash": "sha256-5IPp/rUAOogega5xuRoxcpfkwlGDAyWdizL0Tp2GA4s=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d41eea2839de7de0f2cbe4aa90fde5db8afcd30a", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-22.11", + "type": "indirect" + } + }, "nur": { "locked": { "lastModified": 1684194379, @@ -627,7 +654,7 @@ "nixinate": "nixinate", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_3", "nixpkgsUnstable": "nixpkgsUnstable", "nur": "nur", "openwrt-imagebuilder": "openwrt-imagebuilder", @@ -36,7 +36,6 @@ }; getchoo-website = { url = "github:getchoo/getchoo.github.io"; - inputs.nixpkgs.follows = "nixpkgsUnstable"; inputs.pre-commit-hooks.follows = "pre-commit-hooks"; }; guzzle_api = { @@ -46,7 +45,6 @@ }; hercules-ci-agent = { url = "github:hercules-ci/hercules-ci-agent"; - inputs.nixpkgs.follows = "nixpkgsUnstable"; inputs.flake-parts.follows = "flake-parts"; inputs.pre-commit-hooks-nix.follows = "pre-commit-hooks"; }; diff --git a/hosts/p-body/nginx.nix b/hosts/p-body/nginx.nix index 50a5b92..ae1f251 100644 --- a/hosts/p-body/nginx.nix +++ b/hosts/p-body/nginx.nix @@ -1,9 +1,11 @@ { config, + getchoo-website, pkgs, ... }: let inherit (config.networking) domain; + website = getchoo-website.packages.${pkgs.system}.default; in { networking.firewall.allowedTCPPorts = [80 443]; @@ -35,7 +37,7 @@ in { serverAliases = ["www.${domain}"]; locations."/" = { - root = "${pkgs.getchoo-website}/libexec/getchoo-website/deps/getchoo-website/dist/"; + root = "${website}/libexec/getchoo-website/deps/getchoo-website/dist/"; index = "index.html"; }; }; |