fix: use networkd on servers

This commit is contained in:
uku 2024-08-17 18:33:34 +02:00
parent d0c298b4af
commit 7399f8bbc0
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
3 changed files with 20 additions and 20 deletions

View file

@ -75,9 +75,9 @@ in {
i18n.defaultLocale = "en_US.UTF-8"; i18n.defaultLocale = "en_US.UTF-8";
networking.networkmanager = { networking = {
enable = true; useNetworkd = lib.mkDefault true;
dns = lib.mkDefault "systemd-resolved"; nameservers = ["1.1.1.1" "1.0.0.1"];
}; };
nix = { nix = {
@ -142,12 +142,9 @@ in {
}; };
resolved = { resolved = {
enable = lib.mkDefault true; enable = true;
dnssec = "allow-downgrade"; dnssec = "allow-downgrade";
dnsovertls = "true"; dnsovertls = "true";
extraConfig = ''
DNS=1.1.1.1 1.0.0.1
'';
}; };
tailscale = { tailscale = {

View file

@ -111,6 +111,14 @@
LC_TIME = "fr_FR.UTF-8"; LC_TIME = "fr_FR.UTF-8";
}; };
networking = {
useNetworkd = false;
networkmanager = {
enable = true;
dns = "systemd-resolved";
};
};
programs = { programs = {
firefox.enable = true; firefox.enable = true;
virt-manager.enable = true; virt-manager.enable = true;

View file

@ -14,7 +14,6 @@ in {
environment.systemPackages = with pkgs; [dig traceroute]; environment.systemPackages = with pkgs; [dig traceroute];
services = { services = {
resolved.enable = false;
openssh.ports = [4269]; openssh.ports = [4269];
frp = { frp = {
@ -32,10 +31,7 @@ in {
systemd.services.frp.serviceConfig.EnvironmentFile = secrets.get "frpToken"; systemd.services.frp.serviceConfig.EnvironmentFile = secrets.get "frpToken";
networking = { networking.firewall = {
networkmanager.dns = "default";
firewall = {
allowedTCPPorts = [22]; # forgejo-ssh allowedTCPPorts = [22]; # forgejo-ssh
allowedTCPPortRanges = [ allowedTCPPortRanges = [
{ {
@ -44,5 +40,4 @@ in {
} }
]; ];
}; };
};
} }