From e0dfd08f24ef55284dd8f7ffdbef86f8d3c78030 Mon Sep 17 00:00:00 2001
From: David Crompton <davidcrompton@duck.com>
Date: Fri, 29 Nov 2024 17:13:41 -0500
Subject: [PATCH] hippocampus: 24.05 -> 24.11 trace fixup

---
 machines/hippocampus/configuration.nix                      | 6 ++++--
 machines/hippocampus/nvidia.nix                             | 2 +-
 machines/hippocampus/servers/public/gitea.nix               | 2 +-
 machines/hippocampus/servers/public/nextcloud.nix           | 4 ++--
 .../hippocampus/servers/public/nextcloud/onlyoffice.nix     | 2 +-
 machines/hippocampus/servers/public/tandoor.nix             | 2 +-
 machines/hippocampus/servers/public/vaultwarden.nix         | 2 +-
 machines/hippocampus/services/dyndns.nix                    | 2 +-
 8 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/machines/hippocampus/configuration.nix b/machines/hippocampus/configuration.nix
index 9e9c9ad..b5148d6 100644
--- a/machines/hippocampus/configuration.nix
+++ b/machines/hippocampus/configuration.nix
@@ -79,8 +79,10 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "us";
-    xkbVariant = "";
+    xkb = {
+      layout = "us";
+      variant = "";
+    };
   };
 
   # Enable CUPS to print documents.
diff --git a/machines/hippocampus/nvidia.nix b/machines/hippocampus/nvidia.nix
index 6c707b1..69843f1 100644
--- a/machines/hippocampus/nvidia.nix
+++ b/machines/hippocampus/nvidia.nix
@@ -6,7 +6,7 @@
   nixpkgs.config.nvidia.acceptLicense = true;
 
   services.xserver.videoDrivers = [ "nvidia" ];
-  hardware.opengl.enable = true;
+  hardware.graphics.enable = true;
 
   # Optionally, you may need to select the appropriate driver version for your specific GPU.
   hardware.nvidia.package = config.boot.kernelPackages.nvidiaPackages.legacy_470;
diff --git a/machines/hippocampus/servers/public/gitea.nix b/machines/hippocampus/servers/public/gitea.nix
index 4918fa4..501df4b 100644
--- a/machines/hippocampus/servers/public/gitea.nix
+++ b/machines/hippocampus/servers/public/gitea.nix
@@ -35,7 +35,7 @@ in {
   
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "gitea"
     ];
diff --git a/machines/hippocampus/servers/public/nextcloud.nix b/machines/hippocampus/servers/public/nextcloud.nix
index 978cba0..39612d2 100644
--- a/machines/hippocampus/servers/public/nextcloud.nix
+++ b/machines/hippocampus/servers/public/nextcloud.nix
@@ -15,7 +15,7 @@ in {
     enable = true;
     package = pkgs.nextcloud28;
     hostName = "localhost";
-    extraOptions = {
+    settings = {
       trusted_domains = [
         "cloud.crompton.cc"
         "nextcloud.syzygial.cc"
@@ -99,7 +99,7 @@ in {
   
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "nextcloud"
     ];
diff --git a/machines/hippocampus/servers/public/nextcloud/onlyoffice.nix b/machines/hippocampus/servers/public/nextcloud/onlyoffice.nix
index 78ca85e..572550c 100644
--- a/machines/hippocampus/servers/public/nextcloud/onlyoffice.nix
+++ b/machines/hippocampus/servers/public/nextcloud/onlyoffice.nix
@@ -36,7 +36,7 @@
   
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "onlyoffice"
     ];
diff --git a/machines/hippocampus/servers/public/tandoor.nix b/machines/hippocampus/servers/public/tandoor.nix
index 14720d1..b033131 100644
--- a/machines/hippocampus/servers/public/tandoor.nix
+++ b/machines/hippocampus/servers/public/tandoor.nix
@@ -26,7 +26,7 @@ in {
 
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       tandoor_user
     ];
diff --git a/machines/hippocampus/servers/public/vaultwarden.nix b/machines/hippocampus/servers/public/vaultwarden.nix
index cff76ff..b79fbe3 100644
--- a/machines/hippocampus/servers/public/vaultwarden.nix
+++ b/machines/hippocampus/servers/public/vaultwarden.nix
@@ -16,7 +16,7 @@
   };
   services.postgresql = {
     enable = true;
-    port = 5432;
+    settings.port = 5432;
     ensureDatabases = [
       "vaultwarden"
     ];
diff --git a/machines/hippocampus/services/dyndns.nix b/machines/hippocampus/services/dyndns.nix
index ed09645..939be63 100644
--- a/machines/hippocampus/services/dyndns.nix
+++ b/machines/hippocampus/services/dyndns.nix
@@ -2,7 +2,7 @@
   sops.secrets.ddclient = {};
   services.ddclient = {
     enable = true;
-    use = "web, web=dynamicdns.park-your-domain.com/getip";
+    usev4 = "web, web=dynamicdns.park-your-domain.com/getip";
     protocol = "namecheap";
     server = "dynamicdns.park-your-domain.com";
     username = "crompton.cc";