fix: use networkd on servers
This commit is contained in:
parent
d0c298b4af
commit
7399f8bbc0
3 changed files with 20 additions and 20 deletions
|
@ -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 = {
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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,17 +31,13 @@ in {
|
||||||
|
|
||||||
systemd.services.frp.serviceConfig.EnvironmentFile = secrets.get "frpToken";
|
systemd.services.frp.serviceConfig.EnvironmentFile = secrets.get "frpToken";
|
||||||
|
|
||||||
networking = {
|
networking.firewall = {
|
||||||
networkmanager.dns = "default";
|
allowedTCPPorts = [22]; # forgejo-ssh
|
||||||
|
allowedTCPPortRanges = [
|
||||||
firewall = {
|
{
|
||||||
allowedTCPPorts = [22]; # forgejo-ssh
|
from = 6000;
|
||||||
allowedTCPPortRanges = [
|
to = 7000;
|
||||||
{
|
}
|
||||||
from = 6000;
|
];
|
||||||
to = 7000;
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue