diff --git a/flake.lock b/flake.lock index 17751540..a9c4c60b 100644 --- a/flake.lock +++ b/flake.lock @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1667584046, - "narHash": "sha256-M59pWZZrrlMVqei48zKj2T2tB6BdWKenOlSOkvCO0xE=", + "lastModified": 1667589396, + "narHash": "sha256-M5P+mnQ0/DtSm11sDBT0UQnVtmQoXJh48kL2+6SGC+8=", "owner": "nix-community", "repo": "NUR", - "rev": "6876ea53a8623667941553bdf4b470fc2d0a151f", + "rev": "ead693159674d2f1ac629539199b7e11e1eb5b70", "type": "github" }, "original": { @@ -289,7 +289,8 @@ "nixpkgs": "nixpkgs", "nur": "nur", "tetris": "tetris", - "utils": "utils" + "utils": "utils", + "www-chvp-be": "www-chvp-be" } }, "tetris": { @@ -337,6 +338,32 @@ "repo": "flake-utils-plus", "type": "github" } + }, + "www-chvp-be": { + "inputs": { + "devshell": [ + "devshell" + ], + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1667591467, + "narHash": "sha256-6fqb7ArwKAn5BwB+z6qEBT5rMIntQFrgcIdRngIfTSU=", + "owner": "chvp", + "repo": "www.chvp.be", + "rev": "e242f8473e364981f7f0ca5b84317f68bc1e1cdd", + "type": "github" + }, + "original": { + "owner": "chvp", + "repo": "www.chvp.be", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 7312acc6..734d269b 100644 --- a/flake.nix +++ b/flake.nix @@ -77,9 +77,17 @@ flake-utils.follows = "flake-utils"; }; }; + www-chvp-be = { + url = "github:chvp/www.chvp.be"; + inputs = { + devshell.follows = "devshell"; + flake-utils.follows = "flake-utils"; + nixpkgs.follows = "nixpkgs"; + }; + }; }; - outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils }: + outputs = inputs@{ self, nixpkgs, accentor, accentor-api, accentor-web, agenix, devshell, emacs-overlay, flake-utils, home-manager, nixos-mailserver, nur, tetris, utils, www-chvp-be }: utils.lib.mkFlake { inherit self inputs; channels.nixpkgs = { @@ -93,6 +101,7 @@ tetris = tetris.packages.${self.system}.default; }) nur.overlay + www-chvp-be.overlay ]; }; hostDefaults = { diff --git a/machines/lasting-integrity/default.nix b/machines/lasting-integrity/default.nix index bca54851..24362175 100644 --- a/machines/lasting-integrity/default.nix +++ b/machines/lasting-integrity/default.nix @@ -115,7 +115,7 @@ fqdn = "chvp.be"; options.locations."/".return = "307 https://www.chvp.be$request_uri"; } - { fqdn = "www.chvp.be"; } + { fqdn = "www.chvp.be"; options.root = pkgs."www.chvp.be"; } ]; nextcloud.enable = true; syncthing.enable = true;