From 7e51e9faeb4f7ae23e3bcd0da900a31d7378529a Mon Sep 17 00:00:00 2001
From: Kjetil Orbekk <kj@orbekk.com>
Date: Sun, 16 May 2021 09:58:54 -0400
Subject: Add nextcloud

---
 machines/firelink.nix | 1 +
 modules/common.nix    | 3 +--
 modules/nextcloud.nix | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/machines/firelink.nix b/machines/firelink.nix
index 31ff9ed..1950a30 100644
--- a/machines/firelink.nix
+++ b/machines/firelink.nix
@@ -24,6 +24,7 @@ in
 {
   orbekk.gaming.enable = true;
   orbekk.desktop.enable = true;
+  orbekk.builder.enableRemoteBuilds = true;
 
   orbekk.simple-firewall.allowedTCPPorts =
     [
diff --git a/modules/common.nix b/modules/common.nix
index b05463a..fc99648 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -72,8 +72,7 @@
 
   services = {
     postgresql = {
-      dataDir = "/var/db/postgresql";
-      package = pkgs.postgresql95;
+      package = pkgs.postgresql_12;
     };
     openssh.passwordAuthentication = false;
     openssh.challengeResponseAuthentication = false;
diff --git a/modules/nextcloud.nix b/modules/nextcloud.nix
index 4e16a35..39f3a75 100644
--- a/modules/nextcloud.nix
+++ b/modules/nextcloud.nix
@@ -12,6 +12,7 @@ in
   config = lib.mkIf cfg.enable {
     services.nextcloud = {
       enable = true;
+      package = pkgs.nextcloud21;
       hostName = "localhost";
       config = {
         dbtype = "pgsql";
@@ -21,7 +22,7 @@ in
         adminpassFile = "/opt/secret/nextcloud/admin-pass-file";
         adminuser = "root";
       };
-      autoUpdateApps = true;
+      autoUpdateApps.enable = true;
     };
 
     services.postgresql = {
-- 
cgit v1.2.3