From 528fec2f0d967315f52aee4be3a997df5d8dbc6d Mon Sep 17 00:00:00 2001
From: derped <derped@ophanim.de>
Date: Mon, 23 Nov 2020 23:07:42 +0100
Subject: [PATCH] NixOS 20.09 Changes.

---
 config/fonts.nix                    |  2 +-
 pkgsets/base.nix                    |  2 +-
 services/gitea.nix                  | 51 +++++++++++++++--------------
 services/mailserver                 |  2 +-
 services/nextcloud.nix              |  3 +-
 services/nginx_vHosts/nextcloud.nix |  9 ++---
 6 files changed, 35 insertions(+), 34 deletions(-)

diff --git a/config/fonts.nix b/config/fonts.nix
index 2d83ba8..1c042c3 100644
--- a/config/fonts.nix
+++ b/config/fonts.nix
@@ -4,7 +4,7 @@ with lib;
 
 mkIf (elem "fonts" config.machine.conffiles) {
   fonts = {
-    enableFontDir = true;
+    fontDir.enable = true;
     enableGhostscriptFonts = true;
     fontconfig = {
       enable = true;
diff --git a/pkgsets/base.nix b/pkgsets/base.nix
index 9d7374e..5462e7f 100644
--- a/pkgsets/base.nix
+++ b/pkgsets/base.nix
@@ -41,7 +41,6 @@
     parted
     pciutils
     psmisc
-    rfkill
     ripgrep
     rsync
     sysvtools
@@ -49,6 +48,7 @@
     telnet
     traceroute
     tree
+    utillinux
     vim
     vulnix
     wget
diff --git a/services/gitea.nix b/services/gitea.nix
index 1a16a57..8d312db 100644
--- a/services/gitea.nix
+++ b/services/gitea.nix
@@ -19,32 +19,35 @@ mkIf (elem "gitea" config.machine.services) {
         name = "gitea";
         passwordFile = "${cfg.secretPath}/gitea_db";
       };
-      extraConfig = ''
-        [repository]
-        DISABLE_HTTP_GIT = false
-        USE_COMPAT_SSH_URI = true
-
-        [security]
-        INSTALL_LOCK = true
-        COOKIE_USERNAME = gitea_username
-        COOKIE_REMEMBER_NAME = gitea_userauth
-
-        [service]
-        DISABLE_REGISTRATION = true
-      '';
-    };
-
-    mysql = let
-      cfg = config.services.gitea.database;
-    in {
-      ensureDatabases = [ cfg.name ];
-      ensureUsers = [{
-        name = cfg.user;
-        ensurePermissions = {
-          "${cfg.name}.*" = "ALL PRIVILEGES";
+      settings = {
+        repository = {
+          DISABLE_HTTP_GIT = false;
+          USE_COMPAT_SSH_URI = true;
         };
-      }];
+
+        security = {
+          INSTALL_LOCK = true;
+          COOKIE_USERNAME = "gitea_username";
+          COOKIE_REMEMBER_NAME = "gitea_userauth";
+        };
+
+        service = {
+          DISABLE_REGISTRATION = (lib.mkForce true);
+       };
+      };
     };
+
+#    mysql = let
+#      cfg = config.services.gitea.database;
+#    in {
+#      ensureDatabases = [ cfg.name ];
+#      ensureUsers = [{
+#        name = cfg.user;
+#        ensurePermissions = {
+#          "${cfg.name}.*" = "ALL PRIVILEGES";
+#        };
+#      }];
+#    };
   };
 
   users.users.git = {
diff --git a/services/mailserver b/services/mailserver
index 7bda4c4..ee1ad50 160000
--- a/services/mailserver
+++ b/services/mailserver
@@ -1 +1 @@
-Subproject commit 7bda4c4f110da5134ef9de5efe5d7e6f66bab6e6
+Subproject commit ee1ad50830b479ed8fb46c4c51d3bcdbc2184b8b
diff --git a/services/nextcloud.nix b/services/nextcloud.nix
index 7df8d9d..5527ebb 100644
--- a/services/nextcloud.nix
+++ b/services/nextcloud.nix
@@ -1,4 +1,4 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
 
 with lib;
 
@@ -13,6 +13,7 @@ mkIf (elem "nextcloud" config.machine.services) {
       hostName = domain;
       https = true;
       maxUploadSize = "1024M";
+      package = pkgs.nextcloud20;
       config = {
         adminuser = mkDefault (elemAt cfg.administrators 0).name;
         adminpassFile = "${cfg.secretPath}/nextcloud_admin";
diff --git a/services/nginx_vHosts/nextcloud.nix b/services/nginx_vHosts/nextcloud.nix
index 211dfb5..0a2c3d1 100644
--- a/services/nginx_vHosts/nextcloud.nix
+++ b/services/nginx_vHosts/nextcloud.nix
@@ -2,12 +2,9 @@
 
 with lib;
 
-{
-  vHost = let
-    nextConf = import (lib.elemAt options.services.nextcloud.nginx.enable.declarations 0) { inherit config lib pkgs; };
-  in {
-    inherit ((elemAt nextConf.config.content.contents 2).content.services.nginx.virtualHosts.${config.services.nextcloud.hostName}) root extraConfig locations;
+if (config.services.nextcloud.enable == true) then {
+  vHost = {
     enableACME = config.services.nextcloud.https;
     forceSSL = config.services.nextcloud.https;
   };
-}.vHost
+}.vHost else {}