diff options
| author | lassulus <git@lassul.us> | 2023-06-07 20:55:37 +0200 |
|---|---|---|
| committer | lassulus <git@lassul.us> | 2023-06-07 20:55:37 +0200 |
| commit | f227bcea9ed621c2e54e3c77e939dcae0a629eb6 (patch) | |
| tree | 94d7d7c993a8f99f3c802b57a0966f84e052787a | |
| parent | a4af7cdf7e3c883f699bd309f98324f9ea586c9d (diff) | |
| parent | d3ed4dec9c77b9453e4a7d1eb043c9b70c173388 (diff) | |
Merge remote-tracking branch 'ni/master'
| -rw-r--r-- | tv/2configs/hw/winmax2.nix | 2 | ||||
| -rw-r--r-- | tv/2configs/sshd.nix | 12 |
2 files changed, 8 insertions, 6 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" 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" |