Merge pull request 'enable nextcloud appstore' (#33) from enable-nextcloud-appstore into main

Reviewed-on: #33
This commit is contained in:
Charlotte 🦝 Delenk 2023-04-23 17:42:22 +00:00
commit c80bdb1a39
Signed by: gitea-bot
GPG key ID: C9974EDF9932B558
4 changed files with 108 additions and 107 deletions

View file

@ -4,6 +4,7 @@
...
}: {
services.nextcloud = {
appstoreEnable = true;
caching.redis = true;
config = {
adminpassFile = config.sops.secrets."services/nextcloud/adminpass".path;

View file

@ -69,7 +69,7 @@ rec {
inputs.attic.follows = "attic";
inputs.flake-utils.follows = "flake-utils";
inputs.nixpkgs.follows = "nixpkgs";
# inputs.hydra.follows = "hydra";
# inputs.hydra.follows = "hydra";
};
nixos-config-for-netboot.url = "github:DarkKirb/nixos-config/c9c3d16b23042a25f504a6d71e7075318f1137f8";
nixos-hardware.url = "github:NixOS/nixos-hardware";

View file

@ -58,7 +58,8 @@ in {
lfsJwtSecret = "${cfg.customDir}/conf/lfs_jwt_secret"; # new file for LFS_JWT_SECRET
internalToken = "${cfg.customDir}/conf/internal_token";
replaceSecretBin = "${pkgs.replace-secret}/bin/replace-secret";
in lib.mkForce ''
in
lib.mkForce ''
# copy custom configuration and generate random secrets if needed
${optionalString (!cfg.useWizard) ''
function gitea_setup {

View file

@ -2,8 +2,7 @@ inputs: system: self: prev: let
inherit (inputs) nixpkgs nixpkgs-noto-variable nix-packages;
noto-variable = import nixpkgs-noto-variable {inherit system;};
in
with nixpkgs.legacyPackages.${system};
{
with nixpkgs.legacyPackages.${system}; {
mosh = prev.mosh.overrideAttrs (old: {
patches = [
./mosh/ssh_path.patch