steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

feat(nix/profiles/graphical): use systemd-resolved systemwide

Browse source
This commit is contained in:
steveej 2022-11-08 16:12:31 +01:00
parent 199236bff8
commit 0d9ce372f5
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Justfile
View file

@ -29,6 +29,7 @@ _render_templates:
set -ex set -ex
if ! ip route get 1.1.1.1; then if ! ip route get 1.1.1.1; then
echo No route to WAN. Skipping template rendering... echo No route to WAN. Skipping template rendering...
# TODO: detect if DNS is defunct
else else
source $(just -v _get_nix_path {{invocation_directory()}}/nix/variables/versions.nix) source $(just -v _get_nix_path {{invocation_directory()}}/nix/variables/versions.nix)
nix/scripts/pre-eval-fixed.sh nix/home-manager/profiles/dotfiles/vcsh{.tmpl,}.nix nix/scripts/pre-eval-fixed.sh nix/home-manager/profiles/dotfiles/vcsh{.tmpl,}.nix
@ -91,7 +92,7 @@ update-remote-device devicename target rebuildmode='switch':
template=nix/os/devices/{{ devicename }}/versions.tmpl.nix template=nix/os/devices/{{ devicename }}/versions.tmpl.nix
outfile=nix/os/devices/{{ devicename }}/versions.nix outfile=nix/os/devices/{{ devicename }}/versions.nix
if ! test -e ${template}; then if ! test -e ${template}; then
template="$(just _DEFAULT_VERSION_TMPL)" template="$(just _DEFAULT_VERSION_TMPL)"
fi fi
@ -339,7 +340,7 @@ test-connection:
#! nix-shell -i zsh #! nix-shell -i zsh
#! nix-shell --pure #! nix-shell --pure
while true; do while true; do
FAILURE="false" FAILURE="false"
output=$( output=$(
echo "$(date)\n---" echo "$(date)\n---"

4
nix/os/profiles/graphical/system.nix
View file

@ -3,7 +3,7 @@
{ {
networking.networkmanager = { networking.networkmanager = {
enable = true; enable = true;
dns = "dnsmasq"; dns = "systemd-resolved";
unmanaged = [ unmanaged = [
"interface-name:veth*" "interface-name:veth*"
"interface-name:virbr*" "interface-name:virbr*"
@ -14,7 +14,7 @@
}; };
networking.usePredictableInterfaceNames = false; networking.usePredictableInterfaceNames = false;
services.resolved.enable = false; services.resolved.enable = true;
# hardware related services # hardware related services
services.illum.enable = true; services.illum.enable = true;