diff --git a/Justfile b/Justfile index 22f9c91..e8baa14 100755 --- a/Justfile +++ b/Justfile @@ -29,6 +29,7 @@ _render_templates: set -ex if ! ip route get 1.1.1.1; then echo No route to WAN. Skipping template rendering... + # TODO: detect if DNS is defunct else 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 @@ -91,7 +92,7 @@ update-remote-device devicename target rebuildmode='switch': template=nix/os/devices/{{ devicename }}/versions.tmpl.nix outfile=nix/os/devices/{{ devicename }}/versions.nix - + if ! test -e ${template}; then template="$(just _DEFAULT_VERSION_TMPL)" fi @@ -339,7 +340,7 @@ test-connection: #! nix-shell -i zsh #! nix-shell --pure - while true; do + while true; do FAILURE="false" output=$( echo "$(date)\n---" diff --git a/nix/os/profiles/graphical/system.nix b/nix/os/profiles/graphical/system.nix index e8365ca..0f5d18f 100644 --- a/nix/os/profiles/graphical/system.nix +++ b/nix/os/profiles/graphical/system.nix @@ -3,7 +3,7 @@ { networking.networkmanager = { enable = true; - dns = "dnsmasq"; + dns = "systemd-resolved"; unmanaged = [ "interface-name:veth*" "interface-name:virbr*" @@ -14,7 +14,7 @@ }; networking.usePredictableInterfaceNames = false; - services.resolved.enable = false; + services.resolved.enable = true; # hardware related services services.illum.enable = true;