diff --git a/flake.lock b/flake.lock index 362a82b..46ed4cc 100644 --- a/flake.lock +++ b/flake.lock @@ -184,7 +184,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" + "systems": "systems_2" }, "locked": { "lastModified": 1681202837, @@ -290,20 +290,19 @@ "blobs": "blobs", "flake-compat": "flake-compat_2", "nixpkgs": "nixpkgs_2", - "nixpkgs-24_05": "nixpkgs-24_05", - "utils": "utils" + "nixpkgs-24_11": "nixpkgs-24_11" }, "locked": { - "lastModified": 1734885828, - "narHash": "sha256-G0fB1YBlkalu8lLGRB07K8CpUWNVd+unfrjNomSL7SM=", + "lastModified": 1734884447, + "narHash": "sha256-HA9fAmGNGf0cOYrhgoa+B6BxNVqGAYXfLyx8zIS0ZBY=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "636b82f4175e3f6b1e80d2189bb0469e2ae01a55", + "rev": "63209b1def2c9fc891ad271f474a3464a5833294", "type": "gitlab" }, "original": { "owner": "simple-nixos-mailserver", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixos-mailserver", "type": "gitlab" } @@ -343,18 +342,18 @@ "type": "indirect" } }, - "nixpkgs-24_05": { + "nixpkgs-24_11": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1737299813, + "narHash": "sha256-Qw2PwmkXDK8sPQ5YQ/y/icbQ+TYgbxfjhgnkNJyT1X8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "107d5ef05c0b1119749e381451389eded30fb0d5", "type": "github" }, "original": { "id": "nixpkgs", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "type": "indirect" } }, @@ -552,21 +551,6 @@ "type": "github" } }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "treefmt-nix": { "inputs": { "nixpkgs": [ @@ -602,24 +586,6 @@ "ref": "nixos-unstable", "type": "indirect" } - }, - "utils": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1709126324, - "narHash": "sha256-q6EQdSeUZOG26WelxqkmR7kArjgWCdw5sfJVHPH/7j8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "d465f4819400de7c8d874d50b982301f28a84605", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index f83120b..dc00231 100644 --- a/flake.nix +++ b/flake.nix @@ -15,7 +15,7 @@ }; impermanence.url = "github:nix-community/impermanence"; - mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; + mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.11"; minecraft.url = "github:Infinidoge/nix-minecraft"; # Home inputs diff --git a/hosts/prophet/default.nix b/hosts/prophet/default.nix index 287eb20..bd4465b 100644 --- a/hosts/prophet/default.nix +++ b/hosts/prophet/default.nix @@ -19,6 +19,7 @@ system = { desktop.enable = false; mailserver.enable = true; + webserver.enable = true; wireless.enable = false; wireguard.client.enable = true; stateVersion = "24.05"; diff --git a/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix b/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix index fc87c4f..37d7d87 100644 --- a/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix +++ b/modules/system/services/server/webserver/nginx/virtualhosts/p2/default.nix @@ -4,6 +4,7 @@ "www.${config.domains.p2}" = { enableACME = true; addSSL = true; + default = true; root = "/var/www/landing-page"; }; "${config.domains.p2}" = {