diff --git a/flake.lock b/flake.lock index 2738396..ba9221e 100644 --- a/flake.lock +++ b/flake.lock @@ -35,11 +35,11 @@ }, "emacs-overlay": { "locked": { - "lastModified": 1629307718, - "narHash": "sha256-pmq/5J041I1S1z0ahszO1Od6S5DeCNpxQSGRDigj2L4=", + "lastModified": 1629739732, + "narHash": "sha256-OcSR9n6B0wR6kViudI42Uhpp3JuRGNHyarxO+KHQ7/Y=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "9498d1febd6b91bfe88d0bd632ff7f5288c4ade9", + "rev": "a72e2a008e2551b2e4bcbae0c20e7e6e6f91dfc6", "type": "github" }, "original": { @@ -130,11 +130,11 @@ }, "flake-utils": { "locked": { - "lastModified": 1629284811, + "lastModified": 1629481132, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", "type": "github" }, "original": { @@ -160,11 +160,11 @@ }, "flake-utils_3": { "locked": { - "lastModified": 1629284811, + "lastModified": 1629481132, "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c", + "rev": "997f7efcb746a9c140ce1f13c72263189225f482", "type": "github" }, "original": { @@ -195,11 +195,11 @@ ] }, "locked": { - "lastModified": 1629255483, - "narHash": "sha256-hG6CrmH6ltZbORAWnSLIo+NlRV8ICDN43yhnp03CEWE=", + "lastModified": 1629729582, + "narHash": "sha256-P8bSE0v/alIafhsDVPwIZyBMz4YfHc2H0mOabnsf1so=", "owner": "nix-community", "repo": "home-manager", - "rev": "a5c609b4b1cd4e1381ac8ea1b7d5b0792ebde0a3", + "rev": "9029fd2b9de2147480efab55f351343f4fed73b9", "type": "github" }, "original": { @@ -208,13 +208,48 @@ "type": "github" } }, + "homePage": { + "inputs": { + "hugo-theme-anubis": "hugo-theme-anubis", + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1629402604, + "narHash": "sha256-fFyYgBgjZEJiOnoTMMDqw7rx0bJ1jnxt7s/z3tI5788=", + "owner": "dadada", + "repo": "dadada.li", + "rev": "8cc05931e12bd6b96907edc85994da8dfe7ae0f9", + "type": "github" + }, + "original": { + "owner": "dadada", + "repo": "dadada.li", + "type": "github" + } + }, + "hugo-theme-anubis": { + "flake": false, + "locked": { + "lastModified": 1626675855, + "narHash": "sha256-Vj77NcXxPOcatDbLvW+d90hsUpYH+2eyhpyXv82ZTts=", + "owner": "mitrichius", + "repo": "hugo-theme-anubis", + "rev": "5dab60e04a37896c09a32137aefe821c63b3af04", + "type": "github" + }, + "original": { + "owner": "mitrichius", + "repo": "hugo-theme-anubis", + "type": "github" + } + }, "myNixpkgs": { "locked": { - "lastModified": 1629226339, - "narHash": "sha256-szvgmQcUJM3Kv/wNyIn+wtMrrvsks0bk9JOqI2Ij8Ao=", + "lastModified": 1629292755, + "narHash": "sha256-5xMo32NVLnloY9DveqwJO/Cab1+PbTMPqU4WMmawX5M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2435ea48c3b295d9cd490535730bb13ab8cfd8a5", + "rev": "253aecf69ed7595aaefabde779aa6449195bebb7", "type": "github" }, "original": { @@ -284,11 +319,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1629302925, - "narHash": "sha256-BZUOGUxYk8SXT0rVQIhBkfqUgG1YfStoJadp6iUk9Is=", + "lastModified": 1629744693, + "narHash": "sha256-guZxgF5v8Avqpdu5M/F3ygZ4f67Y6ruS7y2kA5yUhZE=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "878f629005b003fe39c9e619b074e0ff7d9ed0e2", + "rev": "de40acde6c056a7c5f3c9ad4dca0c172fa35d207", "type": "github" }, "original": { @@ -298,6 +333,19 @@ "type": "github" } }, + "nixpkgs": { + "locked": { + "lastModified": 1629226339, + "narHash": "sha256-szvgmQcUJM3Kv/wNyIn+wtMrrvsks0bk9JOqI2Ij8Ao=", + "path": "/nix/store/vy5l0dvdwwhyc988z185f9i7rqbc1n8y-source", + "rev": "2435ea48c3b295d9cd490535730bb13ab8cfd8a5", + "type": "path" + }, + "original": { + "id": "nixpkgs", + "type": "indirect" + } + }, "nose": { "flake": false, "locked": { @@ -436,6 +484,7 @@ "emacs-overlay": "emacs-overlay", "flake-utils": "flake-utils", "home-manager": "home-manager", + "homePage": "homePage", "myNixpkgs": "myNixpkgs", "nix-doom-emacs": "nix-doom-emacs", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index ea8c546..b8dffc9 100644 --- a/flake.nix +++ b/flake.nix @@ -27,6 +27,10 @@ url = git+https://git.dadada.li/dadada/scripts.git?ref=main; inputs.nixpkgs.follows = "myNixpkgs"; }; + homePage = { + flake = false; + url = github:dadada/dadada.li; + }; }; outputs = { ... } @ args: import ./outputs.nix args; diff --git a/nixos/modules/default.nix b/nixos/modules/default.nix index 522fbd5..fef39fb 100644 --- a/nixos/modules/default.nix +++ b/nixos/modules/default.nix @@ -1,4 +1,6 @@ -{ ... }@inputs: +{ homePage +, ... +}@inputs: { admin = import ./admin.nix; backup = import ./backup.nix; @@ -7,7 +9,7 @@ fileShare = import ./fileShare.nix; gitea = import ./gitea.nix; headphones = import ./headphones.nix; - homepage = import ./homepage.nix; + homepage = import ./homepage.nix { inherit homePage; }; networking = import ./networking.nix; share = import ./share.nix; steam = import ./steam.nix; diff --git a/nixos/modules/homepage.nix b/nixos/modules/homepage.nix index 9487197..279fce6 100644 --- a/nixos/modules/homepage.nix +++ b/nixos/modules/homepage.nix @@ -1,6 +1,8 @@ +{ homePage }: { config, pkgs, lib, ... }: let cfg = config.dadada.homePage; + homePagePkg = pkgs.callPackage homePage { }; in with lib; { options.dadada.homePage = { @@ -12,7 +14,7 @@ with lib; { services.nginx.virtualHosts."dadada.li" = { enableACME = true; forceSSL = true; - root = "/var/lib/www/dadada.li"; + root = "${homePagePkg}"; }; }; } diff --git a/outputs.nix b/outputs.nix index 3880460..e6a8e00 100644 --- a/outputs.nix +++ b/outputs.nix @@ -7,6 +7,7 @@ , nixos-hardware , nvd , scripts +, homePage , ... }@inputs: (flake-utils.lib.eachDefaultSystem (system: diff --git a/pkgs/homePage/default.nix b/pkgs/homePage/default.nix deleted file mode 100644 index bcf0318..0000000 --- a/pkgs/homePage/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ stdenv, pandoc, fetchFromGitHub }: -stdenv.mkDerivation rec { - src = fetchFromGitHub { - owner = "dadada"; - repo = "dadada.li"; - rev = "9dcb016b71abefe5546bc118a618bba87295a859"; - sha256 = "1d3vz1h66n8dka90br10niiv8n5blpbfqgcvx8dh8y6880sm1fd7"; - }; - nativeBuildInputs = [ pandoc ]; - buildPhase = '' - ./build.sh - ''; - installPhase = '' - mkdir -p $out - cp -r src/* $out/ - ''; - name = "dadada.li"; - version = "0.2"; -}