From 4b2c36b00f6228293caa1b105bc08443cf616eea Mon Sep 17 00:00:00 2001 From: LavaDesu Date: Mon, 14 Feb 2022 18:34:46 +0700 Subject: [PATCH] services/nginx: add website --- flake.lock | 18 ++++++++++++++++++ flake.nix | 3 +++ modules/services/nginx.nix | 7 ++----- 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 07b81b5..d1eb451 100644 --- a/flake.lock +++ b/flake.lock @@ -576,6 +576,7 @@ "tree-sitter-jsonc": "tree-sitter-jsonc", "twemoji-but-good": "twemoji-but-good", "view-raw": "view-raw", + "website": "website", "who-reacted": "who-reacted", "wine-discord-ipc-bridge": "wine-discord-ipc-bridge", "zelk": "zelk", @@ -734,6 +735,23 @@ "type": "github" } }, + "website": { + "flake": false, + "locked": { + "lastModified": 1609417219, + "narHash": "sha256-ZwJckHqfdx+w02qxf/G1O4wUWJSkly4ot/rII+btB1M=", + "owner": "LavaDesu", + "repo": "lavadesu.github.io", + "rev": "63d9b345ae481658e37ccb64b6992efd729a690b", + "type": "github" + }, + "original": { + "owner": "LavaDesu", + "ref": "master", + "repo": "lavadesu.github.io", + "type": "github" + } + }, "who-reacted": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index a8804b4..4df950d 100644 --- a/flake.nix +++ b/flake.nix @@ -17,6 +17,9 @@ powercord-overlay.url = "github:LavaDesu/powercord-overlay"; powercord-overlay.inputs.nixpkgs.follows = "nixpkgs"; + # services + website = { url = "github:LavaDesu/lavadesu.github.io/master"; flake = false; }; + # zsh plugins zsh-abbr = { url = "github:olets/zsh-abbr"; flake = false; }; zsh-history-substring-search = { url = "github:zsh-users/zsh-history-substring-search"; flake = false; }; diff --git a/modules/services/nginx.nix b/modules/services/nginx.nix index 50e1217..efd2e4f 100644 --- a/modules/services/nginx.nix +++ b/modules/services/nginx.nix @@ -1,4 +1,4 @@ -{ ... }: { +{ inputs, ... }: { security.acme.acceptTerms = true; security.acme.email = "me@lava.moe"; services.nginx = { @@ -12,10 +12,7 @@ "lava.moe" = { enableACME = true; forceSSL = true; - - locations."/".extraConfig = '' - return 404; - ''; + root = inputs.website.outPath; }; }; };