From f5c8627c22afba2965af67a78e8d9471bfb29025 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sat, 16 Sep 2023 21:49:51 +0200
Subject: [PATCH 1/5] feat: add CaT demo2.prod.test

---
 users/b12f/concepts-and-training.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/users/b12f/concepts-and-training.nix b/users/b12f/concepts-and-training.nix
index 4382d8bd..6e98ef6c 100644
--- a/users/b12f/concepts-and-training.nix
+++ b/users/b12f/concepts-and-training.nix
@@ -62,6 +62,11 @@ in {
           user = "root";
         };
 
+        "demo2.prod.test" = {
+          hostname = "10.0.0.5";
+          user = "root";
+        };
+
         "proxy1.test.test" = {
           hostname = "10.0.0.8";
           user = "root";

From 8603106bb7a28cea8855389ef3aaeedf71f03b98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sat, 16 Sep 2023 22:00:50 +0200
Subject: [PATCH 2/5] fix: fix user to run droppie awaker on pie

---
 flake.nix                  | 1 +
 hosts/pie/wake-droppie.nix | 2 +-
 users/b12f/home.nix        | 5 +++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index c71c5818..aa9c412d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -200,6 +200,7 @@
         };
 
         pie = {
+          hostname = "pie.local";
           sshUser = "yule";
         };
 
diff --git a/hosts/pie/wake-droppie.nix b/hosts/pie/wake-droppie.nix
index 56aa6c21..631cb552 100644
--- a/hosts/pie/wake-droppie.nix
+++ b/hosts/pie/wake-droppie.nix
@@ -3,7 +3,7 @@
   services.cron = {
     enable = true;
     systemCronJobs = [
-      "30 1 * * * wake-droppie ${pkgs.wakeonlan}/bin/wakeonlan 08:F1:EA:97:0F:0C"
+      "30 1 * * * root ${pkgs.wakeonlan}/bin/wakeonlan 08:F1:EA:97:0F:0C"
     ];
   };
 }
diff --git a/users/b12f/home.nix b/users/b12f/home.nix
index f0351a3e..70a96b7b 100644
--- a/users/b12f/home.nix
+++ b/users/b12f/home.nix
@@ -33,6 +33,11 @@ in {
     programs.ssh = {
       enable = true;
       matchBlocks = {
+        "pie.local" = {
+          hostname = "pie.local";
+          user = "yule";
+        };
+
         "git.b12f.io" = {
           hostname = "git.b12f.io";
           user = "git";

From 9d8579ed59db076c894c1dd975ea0377c59a6f9a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Fri, 29 Sep 2023 17:50:41 +0200
Subject: [PATCH 3/5] fix: Use electron fixed for wayland

---
 overlays/element-desktop.nix | 3 +++
 overlays/overrides.nix       | 1 +
 overlays/signal-desktop.nix  | 1 +
 3 files changed, 5 insertions(+)
 create mode 100644 overlays/element-desktop.nix

diff --git a/overlays/element-desktop.nix b/overlays/element-desktop.nix
new file mode 100644
index 00000000..e9ac45d6
--- /dev/null
+++ b/overlays/element-desktop.nix
@@ -0,0 +1,3 @@
+final: prev: {
+  element-desktop = prev.element-desktop.override { electron = prev.electron_24; };
+}
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index cdeab7eb..80be2f3d 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -20,6 +20,7 @@ channels: final: prev: {
     paperless-ngx
     waybar
     element-desktop
+    signal-desktop
     ;
 
   haskellPackages =
diff --git a/overlays/signal-desktop.nix b/overlays/signal-desktop.nix
index c8b93567..54f9175d 100644
--- a/overlays/signal-desktop.nix
+++ b/overlays/signal-desktop.nix
@@ -2,6 +2,7 @@ final: prev: {
   signal-desktop = prev.signal-desktop.overrideAttrs (oldAttrs: rec {
     inherit (oldAttrs) pname;
     dir = "Signal";
+    electron = prev.electron_24;
 
     preFixup = ''
       gappsWrapperArgs+=(

From 8217330abffd581e482d96511821ea00a2b24426 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Fri, 29 Sep 2023 17:50:59 +0200
Subject: [PATCH 4/5] fix: Update qemu pa for user ID

---
 hosts/chocolatebar/virtualisation/guest-xml.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hosts/chocolatebar/virtualisation/guest-xml.nix b/hosts/chocolatebar/virtualisation/guest-xml.nix
index 0bde8249..458bb051 100644
--- a/hosts/chocolatebar/virtualisation/guest-xml.nix
+++ b/hosts/chocolatebar/virtualisation/guest-xml.nix
@@ -257,7 +257,7 @@ in ''
       <qemu:arg value='-device'/>
       <qemu:arg value='hda-micro,audiodev=hda'/>
       <qemu:arg value='-audiodev'/>
-      <qemu:arg value='pa,id=hda,server=unix:/run/user/1001/pulse/native'/>
+      <qemu:arg value='pa,id=hda,server=unix:/run/user/1003/pulse/native'/>
     </qemu:commandline>
   </domain>
 ''

From 5063d047088f376e252d90fe6ac1629558230568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Fri, 29 Sep 2023 18:21:08 +0200
Subject: [PATCH 5/5] fix: use lowercase hw-address for droppie

---
 hosts/pie/dhcpd.nix        | 2 +-
 hosts/pie/wake-droppie.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/hosts/pie/dhcpd.nix b/hosts/pie/dhcpd.nix
index c863aed1..bdc3471c 100644
--- a/hosts/pie/dhcpd.nix
+++ b/hosts/pie/dhcpd.nix
@@ -48,7 +48,7 @@
           reservations = [
             {
               hostname = "droppie.local";
-              hw-address = "08:F1:EA:97:0F:0C";
+              hw-address = "08:f1:ea:97:0f:0c";
               ip-address = "192.168.178.3";
             }
             {
diff --git a/hosts/pie/wake-droppie.nix b/hosts/pie/wake-droppie.nix
index 631cb552..992ac9be 100644
--- a/hosts/pie/wake-droppie.nix
+++ b/hosts/pie/wake-droppie.nix
@@ -3,7 +3,7 @@
   services.cron = {
     enable = true;
     systemCronJobs = [
-      "30 1 * * * root ${pkgs.wakeonlan}/bin/wakeonlan 08:F1:EA:97:0F:0C"
+      "30 1 * * * root ${pkgs.wakeonlan}/bin/wakeonlan 08:f1:ea:97:0f:0c"
     ];
   };
 }