From 6d25719a61ccb21fe73a258e358032a9fe105533 Mon Sep 17 00:00:00 2001 From: dadada Date: Mon, 13 Nov 2023 21:57:02 +0100 Subject: [PATCH] Update website --- flake.lock | 23 +---------------------- flake.nix | 2 +- nixos/configurations.nix | 2 +- nixos/modules/homepage.nix | 5 ++--- 4 files changed, 5 insertions(+), 27 deletions(-) diff --git a/flake.lock b/flake.lock index 6d89949..16a7b35 100644 --- a/flake.lock +++ b/flake.lock @@ -235,12 +235,7 @@ } }, "homePage": { - "inputs": { - "hugo-theme-anubis": "hugo-theme-anubis", - "nixpkgs": [ - "nixpkgs" - ] - }, + "flake": false, "locked": { "lastModified": 1699795243, "narHash": "sha256-rBonL9sYcTX5db1PehLVbaf9cFJWB6n4vv522IG1n70=", @@ -255,22 +250,6 @@ "type": "github" } }, - "hugo-theme-anubis": { - "flake": false, - "locked": { - "lastModified": 1693734155, - "narHash": "sha256-/saWnt2ryheBvW9aHqpjAE4aNBhEhkrD62Ch8CI2GvM=", - "owner": "mitrichius", - "repo": "hugo-theme-anubis", - "rev": "e4e2c0bc4145ee152a32fdd940ed398ab0b77e6c", - "type": "github" - }, - "original": { - "owner": "mitrichius", - "repo": "hugo-theme-anubis", - "type": "github" - } - }, "jujutsu": { "inputs": { "flake-utils": [ diff --git a/flake.nix b/flake.nix index 94442c1..48892c5 100644 --- a/flake.nix +++ b/flake.nix @@ -14,7 +14,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware/master"; homePage = { url = "github:dadada/dadada.li"; - inputs.nixpkgs.follows = "nixpkgs"; + flake = false; }; recipemd = { url = "github:dadada/recipemd/nix-flake"; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index a6871f4..8b664e1 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -57,7 +57,7 @@ in system = "x86_64-linux"; extraModules = [ { - dadada.homePage.package = homePage.packages.${system}.homePage; + dadada.homePage.package = homePage; } ./modules/profiles/server.nix ./surgat/configuration.nix diff --git a/nixos/modules/homepage.nix b/nixos/modules/homepage.nix index 32e166a..4508cc7 100644 --- a/nixos/modules/homepage.nix +++ b/nixos/modules/homepage.nix @@ -1,5 +1,4 @@ { config -, pkgs , lib , ... }: @@ -10,8 +9,8 @@ with lib; { options.dadada.homePage = { enable = mkEnableOption "Enable home page"; package = mkOption { - type = lib.types.package; - description = "Package containing the homepage"; + type = lib.types.path; + description = "Path containing the homepage"; }; }; config = mkIf cfg.enable {