From f678ad57f87d754020323712062851c0271f7eb1 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Sat, 2 Dec 2023 21:35:50 +0100
Subject: [PATCH 1/2] Rupert: Add working video decoding HW acceleration

---
 hosts/Rupert.nix | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/hosts/Rupert.nix b/hosts/Rupert.nix
index f1e8896..df4868b 100644
--- a/hosts/Rupert.nix
+++ b/hosts/Rupert.nix
@@ -21,6 +21,24 @@ in
     boot.loader.efi.canTouchEfiVariables = true;
     boot.kernelParams = [ "acpi=force" "reboot=bios" ];
 
+    boot.initrd.kernelModules = [ "i915" ];
+    nixpkgs.config.packageOverrides = pkgs: {
+        vaapiIntel = pkgs.vaapiIntel.override { enableHybridCodec = true; };
+    };
+    hardware.opengl = {
+        enable = true;
+        extraPackages = with pkgs; [
+            (if (lib.versionOlder (lib.versions.majorMinor lib.version) "23.11") then vaapiIntel else intel-vaapi-driver)
+            libvdpau-va-gl
+            vaapiVdpau
+            # intel-media-driver
+        ];
+    };
+    environment.variables = {
+        VDPAU_DRIVER = "va_gl";
+    };
+    hardware.cpu.intel.updateMicrocode = true;
+
     networking.hostName = "Rupert";
 
     users.users = {

From 131c18230a1febb74c8a0d004eb79816a14cafdf Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Sat, 2 Dec 2023 21:36:19 +0100
Subject: [PATCH 2/2] Rupert: Add changes for 23.11

---
 base/packages.nix   |  2 +-
 hosts/Rupert.nix    |  1 +
 hosts/hedgedoc.nix  |  1 -
 hosts/nextcloud.nix | 19 ++++++++-----------
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/base/packages.nix b/base/packages.nix
index ab913fd..b0d0b0a 100644
--- a/base/packages.nix
+++ b/base/packages.nix
@@ -38,7 +38,7 @@
         xsel
     ];
 
-    fonts.fonts = with pkgs; [
+    fonts.packages = with pkgs; [
         vollkorn
         alegreya alegreya-sans
         b612
diff --git a/hosts/Rupert.nix b/hosts/Rupert.nix
index df4868b..aad751c 100644
--- a/hosts/Rupert.nix
+++ b/hosts/Rupert.nix
@@ -74,6 +74,7 @@ in
     services.flatpak.enable = true;
     xdg.portal.extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
     xdg.portal.enable = true;
+    xdg.portal.config.common.default = "*";
 
     hardware.bluetooth = {
         enable = true;
diff --git a/hosts/hedgedoc.nix b/hosts/hedgedoc.nix
index 336db42..b237e92 100644
--- a/hosts/hedgedoc.nix
+++ b/hosts/hedgedoc.nix
@@ -5,7 +5,6 @@ in
 {
     services.hedgedoc = {
         enable = true;
-        workDir = "/data/hedgedoc";
         environmentFile = "/secrets/hedgedoc.env";
         settings = {
             port = 7000;
diff --git a/hosts/nextcloud.nix b/hosts/nextcloud.nix
index fd907d5..c5ac748 100644
--- a/hosts/nextcloud.nix
+++ b/hosts/nextcloud.nix
@@ -6,7 +6,7 @@ in
     services.nextcloud = {
         enable = true;
         https = true;
-        package = pkgs.nextcloud26;
+        package = pkgs.nextcloud27;
         hostName = hostName;
         datadir = "/data/nextcloud";
         config = {
@@ -19,7 +19,6 @@ in
             ];
         };
         caching.redis = true;
-        enableBrokenCiphersForSSE = false;
     };
 
     services.postgresql = {
@@ -27,16 +26,14 @@ in
         ensureUsers = [
             {
                 name = "nextcloud";
-                ensurePermissions = {
-                    "DATABASE nextcloud" = "ALL PRIVILEGES";
-                };
-            }
-            {
-                name = "superuser";
-                ensurePermissions = {
-                    "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
-                };
+                ensureDBOwnership = true;
             }
+            # {
+            #     name = "superuser";
+            #     ensurePermissions = {
+            #         "ALL TABLES IN SCHEMA public" = "ALL PRIVILEGES";
+            #     };
+            # }
         ];
         ensureDatabases = [ "nextcloud" ];
     };