diff --git a/host_vars/desktop/network.yml b/host_vars/desktop/network.yml index 25eaf55..8470e20 100644 --- a/host_vars/desktop/network.yml +++ b/host_vars/desktop/network.yml @@ -2,7 +2,7 @@ lan_interface: enp1s0 lan_interface_mac: 00:d8:61:9f:52:65 local_network_address: 192.168.2.15/24 -local_network_dns: 9.9.9.9 149.112.112.112 +local_network_dns: 192.168.2.254 local_network_gateway: 192.168.2.254 hostname: desktop diff --git a/host_vars/xps/network.yml b/host_vars/xps/network.yml index 3fd2f25..dbfa8ae 100644 --- a/host_vars/xps/network.yml +++ b/host_vars/xps/network.yml @@ -3,14 +3,12 @@ wireless_interface_mac: 98:2c:bc:e3:ff:bc local_network_ssid: KPNAE51C6 local_network_address: 192.168.2.9/24 -local_network_dns: 9.9.9.9 149.112.112.112 +local_network_dns: 192.168.2.254 local_network_gateway: 192.168.2.254 frans_network_ssid: KPNDD1056 frans_network_address: 192.168.2.9/24 -frans_network_dns: 9.9.9.9 149.112.112.112 +frans_network_dns: 192.168.2.254 frans_network_gateway: 192.168.2.254 -default_network_dns: 9.9.9.9 149.112.112.112 - hostname: xps diff --git a/playbook.yml b/playbook.yml index be8a56a..60eba42 100644 --- a/playbook.yml +++ b/playbook.yml @@ -29,8 +29,7 @@ - name: Personal provisiong when: "'personal' in group_names" block: - # Note: set `network.dns.native_https_query` in about:config to prevent - # DoH requests by default. See https://github.com/arkenfox/user.js/issues/1881 + # TODO: require (w)lan interfaces before configuring these - name: Wireguard provisioning ansible.builtin.import_tasks: 'tasks/personal/all/wireguard.yml' tags: wireguard diff --git a/templates/personal/all/mpv/config.j2 b/templates/personal/all/mpv/config.j2 index c51a293..fe1d4a6 100644 --- a/templates/personal/all/mpv/config.j2 +++ b/templates/personal/all/mpv/config.j2 @@ -8,6 +8,3 @@ hwdec=vaapi audio-samplerate=128000 audio-format=s64 - -# Do not close the window on exit -keep-open=yes diff --git a/templates/personal/desktop/network/enp1s0.network.j2 b/templates/personal/desktop/network/enp1s0.network.j2 index af57302..6f1d5e8 100644 --- a/templates/personal/desktop/network/enp1s0.network.j2 +++ b/templates/personal/desktop/network/enp1s0.network.j2 @@ -5,13 +5,13 @@ Name={{ lan_interface }} [Network] Address={{ local_network_address }} -Gateway={{ local_network_gateway }} DNS={{ local_network_dns }} -MulticastDNS=yes -DNSOverTLS=yes -DNSSEC=yes +Gateway={{ local_network_gateway }} DHCP=no +MulticastDNS=yes LinkLocalAddressing=no IPv6AcceptRA=no IPv6SendRA=no + +[Link] RequiredForOnline=routable diff --git a/templates/personal/desktop/network/wg0.network.j2 b/templates/personal/desktop/network/wg0.network.j2 index 4cb1039..36beed3 100644 --- a/templates/personal/desktop/network/wg0.network.j2 +++ b/templates/personal/desktop/network/wg0.network.j2 @@ -7,4 +7,3 @@ Name={{ vpn_default.interface }} Address={{ vpn_default.ip }}/{{ vpn_default.prefix }} DNS={{ vpn_default.dns }} Domains={{ vpn_default.domains | join(' ') }} -BindCarrier={{ lan_interface }} diff --git a/templates/personal/desktop/network/wg1.network.j2 b/templates/personal/desktop/network/wg1.network.j2 index 129cac1..5ea0ce9 100644 --- a/templates/personal/desktop/network/wg1.network.j2 +++ b/templates/personal/desktop/network/wg1.network.j2 @@ -7,4 +7,3 @@ Name={{ vpn_media.interface }} Address={{ vpn_media.ip }}/{{ vpn_media.prefix }} DNS={{ vpn_media.dns }} Domains={{ vpn_media.domains | join(' ') }} -BindCarrier={{ lan_interface }} diff --git a/templates/personal/xps/network/wg0.network.j2 b/templates/personal/xps/network/wg0.network.j2 index 3832085..36beed3 100644 --- a/templates/personal/xps/network/wg0.network.j2 +++ b/templates/personal/xps/network/wg0.network.j2 @@ -7,4 +7,3 @@ Name={{ vpn_default.interface }} Address={{ vpn_default.ip }}/{{ vpn_default.prefix }} DNS={{ vpn_default.dns }} Domains={{ vpn_default.domains | join(' ') }} -BindCarrier={{ wireless_interface }} diff --git a/templates/personal/xps/network/wg1.network.j2 b/templates/personal/xps/network/wg1.network.j2 index ae3f641..5ea0ce9 100644 --- a/templates/personal/xps/network/wg1.network.j2 +++ b/templates/personal/xps/network/wg1.network.j2 @@ -7,4 +7,3 @@ Name={{ vpn_media.interface }} Address={{ vpn_media.ip }}/{{ vpn_media.prefix }} DNS={{ vpn_media.dns }} Domains={{ vpn_media.domains | join(' ') }} -BindCarrier={{ wireless_interface }} diff --git a/templates/personal/xps/network/wlan0-frans.network.j2 b/templates/personal/xps/network/wlan0-frans.network.j2 index 522ddc3..fb19ae3 100644 --- a/templates/personal/xps/network/wlan0-frans.network.j2 +++ b/templates/personal/xps/network/wlan0-frans.network.j2 @@ -6,12 +6,10 @@ SSID={{ frans_network_ssid }} [Network] Address={{ frans_network_address }} -Gateway={{ frans_network_gateway }} DNS={{ frans_network_dns }} -MulticastDNS=yes -DNSOverTLS=yes -DNSSEC=yes +Gateway={{ frans_network_gateway }} DHCP=no +MulticastDNS=yes LinkLocalAddressing=no IPv6AcceptRA=no IPv6SendRA=no diff --git a/templates/personal/xps/network/wlan0-local.network.j2 b/templates/personal/xps/network/wlan0-local.network.j2 index 3d23390..c01faab 100644 --- a/templates/personal/xps/network/wlan0-local.network.j2 +++ b/templates/personal/xps/network/wlan0-local.network.j2 @@ -6,12 +6,10 @@ SSID={{ local_network_ssid }} [Network] Address={{ local_network_address }} -Gateway={{ local_network_gateway }} DNS={{ local_network_dns }} -MulticastDNS=yes -DNSOverTLS=yes -DNSSEC=yes +Gateway={{ local_network_gateway }} DHCP=no +MulticastDNS=yes LinkLocalAddressing=no IPv6AcceptRA=no IPv6SendRA=no diff --git a/templates/personal/xps/network/wlan0.network.j2 b/templates/personal/xps/network/wlan0.network.j2 index ed8191f..a90c88e 100644 --- a/templates/personal/xps/network/wlan0.network.j2 +++ b/templates/personal/xps/network/wlan0.network.j2 @@ -2,9 +2,6 @@ MACAddress={{ wireless_interface_mac }} [Network] -DNS={{ default_network_dns }} -DNSOverTLS=yes -DNSSEC=yes DHCP=yes RequiredForOnline=routable IgnoreCarrierLoss=3s