Blunkall-Technologies/Olympus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added nextcloud maps

Browse Source
This commit is contained in:
Nathan
2024-11-19 15:04:17 -06:00
parent 0e677e3725
commit 04b99e54d1
2 changed files with 16 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
flake.lock generated
View File

@@ -1193,11 +1193,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-mrfMvef+tOYMK35horTWF43tQpES1zI7hb5RbzN3oIk=", "narHash": "sha256-mrfMvef+tOYMK35horTWF43tQpES1zI7hb5RbzN3oIk=",
"path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/home-manager", "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/home-manager",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/home-manager", "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/home-manager",
"type": "path" "type": "path"
} }
}, },
@@ -1807,11 +1807,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=", "narHash": "sha256-QahOuoQdXshu38W5uO7hLhG/yFkT7S2l8Dxicq0wdGk=",
"path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/programs", "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/programs",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/programs", "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/programs",
"type": "path" "type": "path"
} }
}, },
@@ -1882,11 +1882,11 @@
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=", "narHash": "sha256-0Ztx5DVQ2I7hvCK/qjGa4XTdRgbzM8rhf19m0al8lVM=",
"path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/services/sddm", "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/services/sddm",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/hdwra9h524gn8ag3i5akm0a9q0sb7qh8-source/services/sddm", "path": "/nix/store/4vhvs85gwq4fvn8b63bjq5salkrxljl2-source/services/sddm",
"type": "path" "type": "path"
} }
}, },
@@ -1976,12 +1976,12 @@
}, },
"locked": { "locked": {
"lastModified": 1, "lastModified": 1,
"narHash": "sha256-xWEC+I3fCAhwzk52HJbltXC3t9pnFYSIPHIwv7RSxao=", "narHash": "sha256-TdQ04dDlIQsSBNB5mCvye+gVe3E2EK63DXeQ/vMVeCk=",
"path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/system-config", "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/system-config",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/d0zc8mjjmdva9rl39kdw697p1vd6kp11-source/system-config", "path": "/nix/store/gllsqnrdvnpj069qqs11zhy0z3zav8gw-source/system-config",
"type": "path" "type": "path"
} }
}, },

37
system-config/services/containers/nextcloud/default.nix
View File

@@ -11,33 +11,6 @@
config = lib.mkIf config.sysconfig.opts.virtualization.nextcloud.enable { config = lib.mkIf config.sysconfig.opts.virtualization.nextcloud.enable {
/*services.nginx.virtualHosts."localhost".listen = [ { addr = "0.0.0.0"; port = 8081; } ];
services.nextcloud = {
enable = true;
package = pkgs.nextcloud30;
hostName = "localhost";
config = {
adminpassFile = config.sops.secrets."nextcloud/pass".path;
adminuser = "root";
dbtype = "mysql";
};
https = true;
datadir = "/ssd1/Nextcloud/data";
home = "/ssd1/Nextcloud/nextcloud_home";
appstoreEnable = true;
extraApps = with config.services.nextcloud.package.packages.apps; {
inherit mail contacts calendar tasks user_oidc;
};
extraAppsEnable = true;
settings = {
overwriteprotocol = "https";
trusted_domains = [ "nextcloud.blunkall.us" "dummy.blunkall.us" ];
trusted_proxies = [ "192.168.100.11" ];
default_phone_region = "US";
};
database.createLocally = true;
};*/
containers.nextcloud = { containers.nextcloud = {
autoStart = true; autoStart = true;
@@ -60,10 +33,6 @@
config = { config, lib, pkgs, ... }: { config = { config, lib, pkgs, ... }: {
/*systemd.tmpfiles.rules = [
"Z /etc/nextcloud - nextcloud nextcloud"
];*/
systemd.services.secrets_setup = { systemd.services.secrets_setup = {
wantedBy = [ "nextcloud-setup.service" ]; wantedBy = [ "nextcloud-setup.service" ];
@@ -95,6 +64,12 @@
#appstoreEnable = true; #appstoreEnable = true;
extraApps = with config.services.nextcloud.package.packages.apps; { extraApps = with config.services.nextcloud.package.packages.apps; {
inherit mail contacts calendar tasks user_oidc; inherit mail contacts calendar tasks user_oidc;
inherit impersonate end_to_end_encryption notes spreed music memories phonetrack;
maps = pkgs.fetchNextcloudApp {
sha256 = "sha256-seGhUw6+YfoyoBtFtOBUYbJrjRaW7ey9D6QdKu0pmOE=";
url = "https://github.com/nextcloud/maps/releases/download/v1.5.0-1-nightly/maps-1.5.0-1-nightly.tar.gz";
license = "agpl3Plus";
};
}; };
extraAppsEnable = true; extraAppsEnable = true;
settings = { settings = {