diff --git a/configs/common.nix b/configs/common.nix index ed0725d..d5d1c31 100644 --- a/configs/common.nix +++ b/configs/common.nix @@ -75,9 +75,9 @@ in { i18n.defaultLocale = "en_US.UTF-8"; - networking.networkmanager = { - enable = true; - dns = lib.mkDefault "systemd-resolved"; + networking = { + useNetworkd = lib.mkDefault true; + nameservers = ["1.1.1.1" "1.0.0.1"]; }; nix = { @@ -142,12 +142,9 @@ in { }; resolved = { - enable = lib.mkDefault true; + enable = true; dnssec = "allow-downgrade"; dnsovertls = "true"; - extraConfig = '' - DNS=1.1.1.1 1.0.0.1 - ''; }; tailscale = { diff --git a/configs/desktop.nix b/configs/desktop.nix index 5d0038f..1b8b107 100644 --- a/configs/desktop.nix +++ b/configs/desktop.nix @@ -111,6 +111,14 @@ LC_TIME = "fr_FR.UTF-8"; }; + networking = { + useNetworkd = false; + networkmanager = { + enable = true; + dns = "systemd-resolved"; + }; + }; + programs = { firefox.enable = true; virt-manager.enable = true; diff --git a/systems/vesuvio/default.nix b/systems/vesuvio/default.nix index dfd06e5..6b6b421 100644 --- a/systems/vesuvio/default.nix +++ b/systems/vesuvio/default.nix @@ -14,7 +14,6 @@ in { environment.systemPackages = with pkgs; [dig traceroute]; services = { - resolved.enable = false; openssh.ports = [4269]; frp = { @@ -32,17 +31,13 @@ in { systemd.services.frp.serviceConfig.EnvironmentFile = secrets.get "frpToken"; - networking = { - networkmanager.dns = "default"; - - firewall = { - allowedTCPPorts = [22]; # forgejo-ssh - allowedTCPPortRanges = [ - { - from = 6000; - to = 7000; - } - ]; - }; + networking.firewall = { + allowedTCPPorts = [22]; # forgejo-ssh + allowedTCPPortRanges = [ + { + from = 6000; + to = 7000; + } + ]; }; }