From 06984f9d3f3872a85af60ddba42fc7506fbefc61 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Thu, 14 Dec 2023 15:18:56 +0100
Subject: [PATCH 1/5] thrall: Add wireguard config for homematic

---
 hosts/thrall/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 391c744..b254020 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -98,6 +98,11 @@ in {
             publicKey = "NG9y+0RMDTjiG65yC4Z0ymJ0G5fe1mOhl4GyC3xAh1k=";
             allowedIPs = [ "10.0.0.3/32" ];
           }
+          {
+            # homematic
+            publicKey = "slqWgVksOCav0bASxupaFGqfr6vajxDRNIlZYocONQ4=";
+            allowedIPs = [ "10.0.0.4/32" ];
+          }
         ];
       };
     };

From f99a81bc9b5571d2700f8a5d26b7522bd43d3815 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Thu, 14 Dec 2023 15:19:47 +0100
Subject: [PATCH 2/5] thrall: Configure reverse proxy for photo-groove

---
 hosts/thrall/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index b254020..033e2b3 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -208,6 +208,11 @@ in {
       extraConfig = ''
         add_header X-Frame-Options 'SAMEORIGIN';
       '';
+
+      locations."/photo-groove" = {
+        proxyPass = "http://127.0.0.1:8000/";
+        proxyWebsockets = true;
+      };
     };
 
     "www.jakalx.net" = {

From f3adc3a8d573d4977656460b7a7edbb07c17c48f Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Thu, 14 Dec 2023 19:39:37 +0100
Subject: [PATCH 3/5] thrall: Provide update script for postgresql

see: https://nixos.org/manual/nixos/stable/#module-services-postgres-upgrading for details
---
 hosts/thrall/default.nix       |  1 +
 modules/upgrade-pg-cluster.nix | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 modules/upgrade-pg-cluster.nix

diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 033e2b3..3edc688 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -9,6 +9,7 @@ let
 in {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
+    ../../modules/upgrade-pg-cluster.nix
   ];
 
   nix.package = pkgs.nixUnstable;
diff --git a/modules/upgrade-pg-cluster.nix b/modules/upgrade-pg-cluster.nix
new file mode 100644
index 0000000..89feedb
--- /dev/null
+++ b/modules/upgrade-pg-cluster.nix
@@ -0,0 +1,32 @@
+{ config, pkgs, ... }:
+{
+  environment.systemPackages = [
+    (let
+      # XXX specify the postgresql package you'd like to upgrade to.
+      # Do not forget to list the extensions you need.
+      newPostgres = pkgs.postgresql_15.withPackages (pp: [
+        # pp.plv8
+      ]);
+    in pkgs.writeScriptBin "upgrade-pg-cluster" ''
+      set -eux
+      # XXX it's perhaps advisable to stop all services that depend on postgresql
+      systemctl stop postgresql
+
+      export NEWDATA="/var/lib/postgresql/${newPostgres.psqlSchema}"
+
+      export NEWBIN="${newPostgres}/bin"
+
+      export OLDDATA="${config.services.postgresql.dataDir}"
+      export OLDBIN="${config.services.postgresql.package}/bin"
+
+      install -d -m 0700 -o postgres -g postgres "$NEWDATA"
+      cd "$NEWDATA"
+      sudo -u postgres $NEWBIN/initdb -D "$NEWDATA"
+
+      sudo -u postgres $NEWBIN/pg_upgrade \
+        --old-datadir "$OLDDATA" --new-datadir "$NEWDATA" \
+        --old-bindir $OLDBIN --new-bindir $NEWBIN \
+        "$@"
+    '')
+  ];
+}

From 4b3ed182189088de581a3d6a082c6bda65647d0a Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Thu, 14 Dec 2023 21:44:37 +0100
Subject: [PATCH 4/5] cli: Use either eza or exa depending on home-manager
 version

---
 home/cli.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/home/cli.nix b/home/cli.nix
index 4da6676..44777d0 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -7,6 +7,8 @@ let
     fullName = "Alexander Kobjolke";
     mail = "me@failco.de";
   };
+
+  myEza = if builtins.hasAttr "eza" pkgs then "eza" else "exa";
 in {
   imports = [
     # shell config
@@ -126,7 +128,7 @@ in {
     };
 
     # better ls with icons and stuff, maybe also try lsd
-    eza = {
+    ${myEza} = {
       enable = true;
       icons = true;
       enableAliases = true;

From 6261d8bf97b934d335cb7fd4a3c03e82c9b5976c Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Thu, 14 Dec 2023 21:45:52 +0100
Subject: [PATCH 5/5] thrall: Upgrade postgres to v15.5

---
 hosts/thrall/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hosts/thrall/default.nix b/hosts/thrall/default.nix
index 3edc688..abdb103 100644
--- a/hosts/thrall/default.nix
+++ b/hosts/thrall/default.nix
@@ -389,6 +389,7 @@ in {
     virusScanning = true;
   };
 
+  services.postgresql = { package = pkgs.postgresql_15; };
   services.roundcube = {
     enable = true;
     hostName = "mail.failco.de";