From a2ce4a9ba7c18052133b0823739a5315be60317a Mon Sep 17 00:00:00 2001 From: Paul-Nicolas Madelaine Date: Tue, 10 Sep 2024 16:50:59 +0200 Subject: [PATCH] use papermod/master --- fetch.sh | 3 +-- flake.lock | 19 ++++++++++++++++++- flake.nix | 11 +++++------ 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/fetch.sh b/fetch.sh index 0dd4fda..c07aae6 100755 --- a/fetch.sh +++ b/fetch.sh @@ -1,8 +1,7 @@ #!/usr/bin/env bash -version="v7.0" rm -rf themes mkdir themes cd themes -curl -L "https://github.com/adityatelange/hugo-PaperMod/tarball/$version" | tar -zx +curl -L "https://github.com/adityatelange/hugo-papermod/tarball/master" | tar -zx mv "$(ls)" papermod diff --git a/flake.lock b/flake.lock index be27897..0617a52 100644 --- a/flake.lock +++ b/flake.lock @@ -33,10 +33,27 @@ "type": "github" } }, + "papermod": { + "flake": false, + "locked": { + "lastModified": 1723905772, + "narHash": "sha256-iKKAAR5ipeimIgC137tbpkWlwIzNDAcPPKNLwdhW1CI=", + "owner": "adityatelange", + "repo": "hugo-papermod", + "rev": "58c4841c26325eaa788d9b13e65d5dfc95d9367c", + "type": "github" + }, + "original": { + "owner": "adityatelange", + "repo": "hugo-papermod", + "type": "github" + } + }, "root": { "inputs": { "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "papermod": "papermod" } }, "systems": { diff --git a/flake.nix b/flake.nix index aabf66a..f21881a 100644 --- a/flake.nix +++ b/flake.nix @@ -2,6 +2,10 @@ inputs = { nixpkgs.url = "github:nixos/nixpkgs"; flake-utils.url = "github:numtide/flake-utils"; + papermod = { + url = "github:adityatelange/hugo-papermod"; + flake = false; + }; }; outputs = @@ -9,17 +13,12 @@ self, nixpkgs, flake-utils, + papermod, }: flake-utils.lib.eachDefaultSystem ( system: let pkgs = import nixpkgs { inherit system; }; - papermod = pkgs.fetchFromGitHub { - owner = "adityatelange"; - repo = "hugo-PaperMod"; - rev = "v7.0"; - hash = "sha256-33EnCEvTxZYn31fxZkYJlQXvJsczXMVufSj6QJJHrLk="; - }; website = pkgs.stdenv.mkDerivation { name = "website"; src = ./.;