diff --git a/flake.lock b/flake.lock index 9b541c1..08e03c1 100644 --- a/flake.lock +++ b/flake.lock @@ -81,6 +81,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_4" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -177,6 +195,7 @@ "home-manager": "home-manager_2", "nixpkgs": "nixpkgs", "stable": "stable", + "tilde": "tilde", "tildefriends": "tildefriends", "vedirect-reader": "vedirect-reader" } @@ -242,9 +261,45 @@ "type": "github" } }, - "tildefriends": { + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tilde": { "inputs": { "flake-utils": "flake-utils", + "nixpkgs": [ + "stable" + ] + }, + "locked": { + "lastModified": 1724511399, + "narHash": "sha256-9vNzhIrWwyCcq+VR5FUJl44A1WG8x/QIWN6BkugWfdc=", + "ref": "refs/heads/master", + "rev": "4f8edb0520f32a6c5cbf84229e3a342859748021", + "revCount": 62, + "type": "git", + "url": "https://gitea.com/tasiaiso/tilde" + }, + "original": { + "type": "git", + "url": "https://gitea.com/tasiaiso/tilde" + } + }, + "tildefriends": { + "inputs": { + "flake-utils": "flake-utils_2", "nixpkgs": "nixpkgs_2" }, "locked": { @@ -264,7 +319,7 @@ }, "vedirect-reader": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": "nixpkgs_3" }, "locked": { diff --git a/flake.nix b/flake.nix index e2073fa..753f97c 100644 --- a/flake.nix +++ b/flake.nix @@ -20,6 +20,14 @@ tildefriends.url = "git+https://dev.tildefriends.net/cory/tildefriends?ref=main"; vedirect-reader.url = "git+https://gitea.com/tasiaiso/vedirect-reader"; + tilde = { + url = "git+https://gitea.com/tasiaiso/tilde"; + inputs.nixpkgs.follows = "stable"; + }; + # home-manager = { + # url = "github:nix-community/home-manager/release-24.05"; + # inputs.nixpkgs.follows = "stable"; + # }; # nixos-conf-editor.url = "github:snowfallorg/nixos-conf-editor"; # nix-software-center.url = "github:snowfallorg/nix-software-center"; @@ -41,6 +49,7 @@ # nix-software-center, tildefriends, agenix, + tilde, ... } @ inputs: let inherit (self) outputs; diff --git a/hosts/vulpecula/configuration.nix b/hosts/vulpecula/configuration.nix index dcb324d..2107a23 100644 --- a/hosts/vulpecula/configuration.nix +++ b/hosts/vulpecula/configuration.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: let +{ config, lib, inputs, ... }: let sshKeys = import ../../crypto/ssh-keys.nix; in { imports = [ @@ -51,11 +51,12 @@ in { services.nginx = { enable = true; - + recommendedProxySettings = true; + recommendedTlsSettings = true; virtualHosts."vulpecula.zone" = { addSSL = true; enableACME = true; - root = "/www"; + root = "${inputs.tilde.packages.x86_64-linux.default}"; }; virtualHosts."git.vulpecula.zone" = { addSSL = true;