From ed299eb76953c23ea47ea27b73e9822531e49c7f Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 6 Jun 2023 15:12:43 +0200
Subject: [PATCH 1/2] tv winmax2: remove hidpi option
hardware.video.hidpi.enable has been removed in NixOS 23.05
---
tv/2configs/hw/winmax2.nix | 2 --
1 file changed, 2 deletions(-)
diff --git a/tv/2configs/hw/winmax2.nix b/tv/2configs/hw/winmax2.nix
index 49af7611c..7b284668d 100644
--- a/tv/2configs/hw/winmax2.nix
+++ b/tv/2configs/hw/winmax2.nix
@@ -27,8 +27,6 @@
pkgs.rocm-opencl-runtime
];
- hardware.video.hidpi.enable = true;
-
networking.wireless.enable = true;
networking.wireless.interfaces = [
"wlp1s0"
From d3ed4dec9c77b9453e4a7d1eb043c9b70c173388 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Tue, 6 Jun 2023 15:30:02 +0200
Subject: [PATCH 2/2] tv sshd: admit hosts without IPv4 addresses
---
tv/2configs/sshd.nix | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tv/2configs/sshd.nix b/tv/2configs/sshd.nix
index 33856ac12..0610e3c98 100644
--- a/tv/2configs/sshd.nix
+++ b/tv/2configs/sshd.nix
@@ -9,10 +9,14 @@ in {
tv.iptables.extra.nat.OUTPUT = [
"-o lo -p tcp --dport 11423 -j REDIRECT --to-ports 22"
];
- tv.iptables.extra4.nat.PREROUTING = [
- "-d ${cfg.host.nets.retiolum.ip4.addr} -p tcp --dport 22 -j ACCEPT"
- "-d ${cfg.host.nets.wiregrill.ip4.addr} -p tcp --dport 22 -j ACCEPT"
- ];
+ tv.iptables.extra4.nat.PREROUTING =
+ map
+ (net: "-d ${net.ip4.addr} -p tcp --dport 22 -j ACCEPT")
+ (filter (net: net.ip4 != null)
+ [
+ cfg.host.nets.retiolum
+ cfg.host.nets.wiregrill
+ ]);
tv.iptables.extra6.nat.PREROUTING = [
"-d ${cfg.host.nets.retiolum.ip6.addr} -p tcp --dport 22 -j ACCEPT"
"-d ${cfg.host.nets.wiregrill.ip6.addr} -p tcp --dport 22 -j ACCEPT"