update: system update & refactor
# Breaking Changes - sops location movod to "system/dev/<dev-name>/sops/sops-conf.nix" - flake devices declaration changes - whole flake update
This commit is contained in:
parent
321f740af0
commit
6a71b601f5
116 changed files with 2576 additions and 3634 deletions
|
|
@ -2,11 +2,10 @@
|
|||
hostname,
|
||||
adminpassFile,
|
||||
datadir ? null,
|
||||
dataBackupPath ? null,
|
||||
dbBackupPath ? null,
|
||||
https ? true,
|
||||
configureACME ? true,
|
||||
trusted ? [ ],
|
||||
trusted-domains ? [ ],
|
||||
trusted-proxies ? [ ],
|
||||
}:
|
||||
{
|
||||
config,
|
||||
|
|
@ -17,9 +16,7 @@
|
|||
let
|
||||
inherit (lib) mkIf;
|
||||
|
||||
enableBackup = dataBackupPath != null || dbBackupPath != null;
|
||||
|
||||
nextcloudPkg = pkgs.nextcloud31.overrideAttrs (oldAttr: rec {
|
||||
nextcloudPkg = pkgs.nextcloud32.overrideAttrs (oldAttr: rec {
|
||||
caBundle = config.security.pki.caBundle;
|
||||
postPatch = ''
|
||||
cp ${caBundle} resources/config/ca-bundle.crt
|
||||
|
|
@ -30,8 +27,8 @@ in
|
|||
imports = [
|
||||
"${
|
||||
fetchTarball {
|
||||
url = "https://github.com/onny/nixos-nextcloud-testumgebung/archive/fa6f062830b4bc3cedb9694c1dbf01d5fdf775ac.tar.gz";
|
||||
sha256 = "0gzd0276b8da3ykapgqks2zhsqdv4jjvbv97dsxg0hgrhb74z0fs";
|
||||
url = "https://github.com/onny/nixos-nextcloud-testumgebung/archive/c3fdbf165814d403a8f8e81ff8e15adcbe7eadd0.tar.gz";
|
||||
sha256 = "sha256:19w6m1k4a0f48k1mnvdjkvcc8cnrlqg65kvyqzhxpkp5dbph9nzg";
|
||||
}
|
||||
}/nextcloud-extras.nix"
|
||||
];
|
||||
|
|
@ -54,7 +51,7 @@ in
|
|||
package = nextcloudPkg;
|
||||
configureRedis = true;
|
||||
hostName = hostname;
|
||||
https = if https then true else false;
|
||||
https = https;
|
||||
datadir = lib.mkIf (datadir != null) datadir;
|
||||
phpExtraExtensions =
|
||||
all: with all; [
|
||||
|
|
@ -65,19 +62,13 @@ in
|
|||
inherit (config.services.nextcloud.package.packages.apps)
|
||||
contacts
|
||||
calendar
|
||||
tasks
|
||||
whiteboard
|
||||
user_oidc
|
||||
;
|
||||
|
||||
camerarawpreviews = pkgs.fetchNextcloudApp {
|
||||
url = "https://github.com/ariselseng/camerarawpreviews/releases/download/v0.8.7/camerarawpreviews_nextcloud.tar.gz";
|
||||
sha256 = "sha256-aiMUSJQVbr3xlJkqOaE3cNhdZu3CnPEIWTNVOoG4HSo=";
|
||||
license = "agpl3Plus";
|
||||
};
|
||||
|
||||
user_oidc = pkgs.fetchNextcloudApp {
|
||||
url = "https://github.com/nextcloud-releases/user_oidc/releases/download/v7.2.0/user_oidc-v7.2.0.tar.gz";
|
||||
sha256 = "sha256-nXDWfRP9n9eH+JGg1a++kD5uLMsXh5BHAaTAOgLI9W4=";
|
||||
url = "https://github.com/ariselseng/camerarawpreviews/releases/download/v0.8.8/camerarawpreviews_nextcloud.tar.gz";
|
||||
sha256 = "sha256-Pnjm38hn90oV3l4cPAnQ+oeO6x57iyqkm80jZGqDo1I=";
|
||||
license = "agpl3Plus";
|
||||
};
|
||||
};
|
||||
|
|
@ -92,8 +83,8 @@ in
|
|||
settings = {
|
||||
allow_local_remote_servers = true;
|
||||
log_type = "syslog";
|
||||
trusted_proxies = trusted;
|
||||
trusted_domains = trusted;
|
||||
trusted_proxies = trusted-proxies;
|
||||
trusted_domains = trusted-domains;
|
||||
enabledPreviewProviders = [
|
||||
"OC\\Preview\\BMP"
|
||||
"OC\\Preview\\GIF"
|
||||
|
|
@ -120,5 +111,4 @@ in
|
|||
environment.systemPackages = with pkgs; [
|
||||
exiftool
|
||||
];
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue