diff --git a/flake.lock b/flake.lock index 795f96d..617ee97 100644 --- a/flake.lock +++ b/flake.lock @@ -233,16 +233,14 @@ "homepage": { "inputs": { "flake-utils": "flake-utils_3", - "nixpkgs": [ - "nixpkgs" - ] + "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1758070616, - "narHash": "sha256-VPmnIwfs9tiZks3wl7SxkHtXe8gkOaRMQG1N+wXudoo=", + "lastModified": 1757794882, + "narHash": "sha256-p/zUThVaRHsbmZx2xFklFKgFneZ8n4k4QwZ8mgfoSeg=", "ref": "refs/heads/master", - "rev": "50d499a8fc192450719720680b6361f1e20cfa55", - "revCount": 53, + "rev": "9475df091491ca7b51c1b60b542720f10637d9dc", + "revCount": 34, "type": "git", "url": "https://git.posixlycorrect.com/fabian/homepage.git" }, @@ -312,7 +310,7 @@ "nixGL": { "inputs": { "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs_2" }, "locked": { "lastModified": 1752054764, @@ -330,17 +328,15 @@ }, "nixpkgs": { "locked": { - "lastModified": 1746378225, - "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "93e8cdce7afc64297cfec447c311470788131cd9", - "type": "github" + "lastModified": 1719426051, + "narHash": "sha256-yJL9VYQhaRM7xs0M867ZFxwaONB9T2Q4LnGo1WovuR4=", + "path": "/nix/store/f0ddmw6s86y567yg06h5019z72szbzch-source", + "rev": "89c49874fb15f4124bf71ca5f42a04f2ee5825fd", + "type": "path" }, "original": { - "owner": "nixos", - "repo": "nixpkgs", - "type": "github" + "id": "nixpkgs", + "type": "indirect" } }, "nixpkgs-lib": { @@ -359,6 +355,21 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1746378225, + "narHash": "sha256-OeRSuL8PUjIfL3Q0fTbNJD/fmv1R+K2JAOqWJd3Oceg=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "93e8cdce7afc64297cfec447c311470788131cd9", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1757810152, "narHash": "sha256-Vp9K5ol6h0J90jG7Rm4RWZsCB3x7v5VPx588TQ1dkfs=", @@ -374,7 +385,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1757745802, "narHash": "sha256-hLEO2TPj55KcUFUU1vgtHE9UEIOjRcH/4QbmfHNF820=", @@ -393,7 +404,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1757879066, @@ -469,7 +480,7 @@ "impermanence": "impermanence", "mediawikiSkinCitizen": "mediawikiSkinCitizen", "nixGL": "nixGL", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "nur": "nur", "trivionomicon": "trivionomicon", "unstable": "unstable", diff --git a/flake.nix b/flake.nix index f60e7c6..0c39b9e 100644 --- a/flake.nix +++ b/flake.nix @@ -13,10 +13,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - homepage = { - url = "git+https://git.posixlycorrect.com/fabian/homepage.git"; - inputs.nixpkgs.follows = "nixpkgs"; - }; + homepage.url = "git+https://git.posixlycorrect.com/fabian/homepage.git"; authentik-nix = { url = "github:nix-community/authentik-nix"; diff --git a/sys/platforms/vps/srv/net.nix b/sys/platforms/vps/srv/net.nix index 61adb45..638a997 100644 --- a/sys/platforms/vps/srv/net.nix +++ b/sys/platforms/vps/srv/net.nix @@ -56,7 +56,7 @@ in { forceSSL = true; enableACME = true; locations = { - "/".root = "${pkgs.trivium.homepage}"; + "/".root = "${pkgs.local.homepage}"; "/.well-known/openpgpkey/hu/".alias = "/var/public/wkd/"; }; };