From df817fa2c14e043762ed43da5d0b1511f19484a3 Mon Sep 17 00:00:00 2001 From: "Jill \"oatmealine\" Monoids" Date: Fri, 8 Dec 2023 09:14:07 +0100 Subject: [PATCH] attempts to get nextcloud to work --- hosts/lucent-firepit/default.nix | 2 +- modules/services/nextcloud.nix | 13 +++++++------ modules/shell/fish.nix | 4 ++++ 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/hosts/lucent-firepit/default.nix b/hosts/lucent-firepit/default.nix index 1595619..d7e8f16 100644 --- a/hosts/lucent-firepit/default.nix +++ b/hosts/lucent-firepit/default.nix @@ -175,7 +175,7 @@ in { }; nextcloud = { - enable = true; + enable = false; domain = "nextcloud.dark-firepit.cloud"; }; diff --git a/modules/services/nextcloud.nix b/modules/services/nextcloud.nix index 5f04090..37482ed 100644 --- a/modules/services/nextcloud.nix +++ b/modules/services/nextcloud.nix @@ -7,7 +7,7 @@ in { options.modules.services.nextcloud = { enable = mkOption { type = types.bool; - default = false; + default = mkForce false; }; package = mkOption { @@ -38,11 +38,12 @@ in { package = cfg.package; hostName = cfg.domain; enableBrokenCiphersForSSE = false; + database.createLocally = true; config = { dbtype = "pgsql"; - dbuser = "nextcloud"; + dbuser = "nextcloud3"; dbhost = "/run/postgresql"; - dbname = "nextcloud"; + dbname = "nextcloud3"; adminpassFile = "/etc/nextcloudpass"; adminuser = "root"; # "log_type" = "systemd"; @@ -59,10 +60,10 @@ in { services.postgresql = { enable = true; - ensureDatabases = [ "nextcloud" ]; + ensureDatabases = [ "nextcloud3" ]; ensureUsers = [ - { name = "nextcloud"; - ensurePermissions."DATABASE nextcloud" = "ALL PRIVILEGES"; + { name = "nextcloud3"; + ensurePermissions."DATABASE nextcloud3" = "ALL PRIVILEGES"; } ]; }; diff --git a/modules/shell/fish.nix b/modules/shell/fish.nix index 572acd4..28136ef 100644 --- a/modules/shell/fish.nix +++ b/modules/shell/fish.nix @@ -15,5 +15,9 @@ in { home._.programs.fish = { enable = true; }; + + environment.systemPackages = with pkgs; [ + fishPlugins.tide + ]; }; }