diff --git a/flake.lock b/flake.lock index e06eb76..3a1c9af 100644 --- a/flake.lock +++ b/flake.lock @@ -146,6 +146,32 @@ "type": "github" } }, + "nextcloud-news": { + "flake": false, + "locked": { + "lastModified": 1720424186, + "narHash": "sha256-AhTZGQCLeNgsRBF5w3+Lf9JtNN4D1QncB5t+odU+XUc=", + "type": "tarball", + "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz" + } + }, + "nextcloud-twofactor-totp": { + "flake": false, + "locked": { + "lastModified": 1665648150, + "narHash": "sha256-zAPNugbvngXcpgWJLD78YAg4G1QtGaphx1bhhg7mLKE=", + "type": "tarball", + "url": "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz" + }, + "original": { + "type": "tarball", + "url": "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -291,6 +317,8 @@ "firefox-addons": "firefox-addons", "flake-parts": "flake-parts", "home-manager": "home-manager", + "nextcloud-news": "nextcloud-news", + "nextcloud-twofactor-totp": "nextcloud-twofactor-totp", "nix-index-database": "nix-index-database", "nix-vscode-extensions": "nix-vscode-extensions", "nixos-generators": "nixos-generators", diff --git a/flake.nix b/flake.nix index 23600b1..d76316e 100644 --- a/flake.nix +++ b/flake.nix @@ -56,6 +56,15 @@ url = "github:yokoffing/Betterfox"; flake = false; }; + + nextcloud-twofactor-totp = { + url = "https://github.com/nextcloud-releases/twofactor_totp/releases/download/v6.4.1/twofactor_totp-v6.4.1.tar.gz"; + flake = false; + }; + nextcloud-news = { + url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha8/news.tar.gz"; + flake = false; + }; }; outputs = diff --git a/hosts/stratus/containers/nextcloud/default.nix b/hosts/stratus/containers/nextcloud/default.nix index 0bf590a..1db5903 100644 --- a/hosts/stratus/containers/nextcloud/default.nix +++ b/hosts/stratus/containers/nextcloud/default.nix @@ -2,6 +2,7 @@ containers.nextcloud.config = { config, + inputs, pkgs, dataDir, ... @@ -58,14 +59,16 @@ inherit (config.services.nextcloud.package.packages.apps) calendar contacts onlyoffice; twofactor_totp = pkgs.fetchNextcloudApp { - url = - let - name = "twofactor_totp"; - version = "6.4.1"; - in - "https://github.com/nextcloud-releases/${name}/releases/download/v${version}/${name}-v${version}.tar.gz"; - sha256 = "sha256-zAPNugbvngXcpgWJLD78YAg4G1QtGaphx1bhhg7mLKE="; - license = "gpl3"; + url = inputs.nextcloud-twofactor-totp.outPath; + sha256 = inputs.nextcloud-twofactor-totp.narHash; + license = "agpl3Plus"; + unpack = true; + }; + news = pkgs.fetchNextcloudApp { + url = inputs.nextcloud-news.outPath; + sha256 = inputs.nextcloud-news.narHash; + license = "agpl3Plus"; + unpack = true; }; }; };