diff --git a/nix/default.nix b/nix/default.nix index 0760f12..7ebaa7b 100644 --- a/nix/default.nix +++ b/nix/default.nix @@ -35,7 +35,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall mkdir -p "$out" - cp -r dist "$out" + cp -r dist/* "$out" runHook postInstall ''; diff --git a/nix/module.nix b/nix/module.nix index 466fe1d..9e9cb16 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -1,29 +1,19 @@ self: { + lib, pkgs, config, - lib, ... }: let - inherit (lib) mkIf mkEnableOption getExe; + inherit (lib) mkIf mkEnableOption; in { options.services.isabelroses-website.enable = mkEnableOption "isabelroses-website"; config = mkIf config.services.isabelroses-website.enable { - systemd.services."isabelroses-website" = { - description = "isabelroses.com"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - Type = "simple"; - ReadWritePaths = [ "/srv/storage/isabelroses.com" ]; - DynamicUser = true; - ExecStart = getExe self.packages.${pkgs.stdenv.hostPlatform.system}.default; - Restart = "always"; - }; + services.nginx.virtualHosts.isabelroses-website = { + root = self.packages.${pkgs.stdenv.hostPlatform.system}.isabelroses-website; }; }; } diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index 2e30a4b..0cdc920 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -60,7 +60,7 @@ const { title, description, image } = Astro.props; { image && ( ) } - +