diff options
| author | lassulus <lassulus@lassul.us> | 2020-06-07 13:10:52 +0200 |
|---|---|---|
| committer | lassulus <lassulus@lassul.us> | 2020-06-07 13:10:52 +0200 |
| commit | 15f39ef2e925858eb787c6a52ccb896928b28b47 (patch) | |
| tree | 2ac18efb3fe36040c71753f578529470cdb884c5 /tv/3modules | |
| parent | fe119203ea4d2dc3e618d113c7f70629fd750aa3 (diff) | |
| parent | 8ae780cf2689a0e62718fe0dcc8b80e584f68d23 (diff) | |
Merge remote-tracking branch 'ni/master'
Diffstat (limited to 'tv/3modules')
| -rw-r--r-- | tv/3modules/Xresources.nix | 2 | ||||
| -rw-r--r-- | tv/3modules/dnsmasq.nix | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tv/3modules/Xresources.nix b/tv/3modules/Xresources.nix index ce7ac9ac2..ab233dd65 100644 --- a/tv/3modules/Xresources.nix +++ b/tv/3modules/Xresources.nix @@ -1,7 +1,7 @@ with import <stockholm/lib>; { config, pkgs, ... }: let cfg = { - enable = config.tv.Xresources != {}; + enable = config.services.xserver.enable && config.tv.Xresources != {}; user = config.krebs.build.user; }; in { diff --git a/tv/3modules/dnsmasq.nix b/tv/3modules/dnsmasq.nix index ec927f98a..ab24ac089 100644 --- a/tv/3modules/dnsmasq.nix +++ b/tv/3modules/dnsmasq.nix @@ -31,8 +31,9 @@ in { }; services.dnsmasq.enable = true; services.dnsmasq.extraConfig = '' + bind-interfaces dhcp-range=${cfg.dhcp-range} - interface=${cfg.interface} + listen-address=${cfg.address} ''; tv.iptables.extra.filter.INPUT = [ "-i ${cfg.interface} -p tcp -m tcp --dport bootps -j ACCEPT" |