diff --git a/hosts/del/configuration.nix b/hosts/del/configuration.nix index 4f21dd1..3bdd57c 100644 --- a/hosts/del/configuration.nix +++ b/hosts/del/configuration.nix @@ -24,23 +24,6 @@ ]; }; - networking = { - networkmanager = { - enable = true; - dns = "systemd-resolved"; - }; - firewall.checkReversePath = "loose"; - }; - - services.resolved.enable = true; - - # don't wait for network to boot faster - # https://old.reddit.com/r/NixOS/comments/vdz86j/how_to_remove_boot_dependency_on_network_for_a - systemd = { - targets.network-online.wantedBy = lib.mkForce []; # default is [ "multi-user.target" ] - services.NetworkManager-wait-online.wantedBy = lib.mkForce []; # default is [ "network-online.target" ] - }; - time.timeZone = "Europe/Warsaw"; nix = { diff --git a/hosts/del/profile.nix b/hosts/del/profile.nix index 0af3858..a1572af 100644 --- a/hosts/del/profile.nix +++ b/hosts/del/profile.nix @@ -2,6 +2,7 @@ _: { imports = [ ../../options/boot/systemd-boot.nix ../../options/common/docs.nix + ../../options/common/networking.nix ../../options/common/oomd.nix ../../options/common/pin-registry.nix ../../options/common/preserve-system.nix diff --git a/hosts/niks/configuration.nix b/hosts/niks/configuration.nix index 1601d6d..9bc801a 100644 --- a/hosts/niks/configuration.nix +++ b/hosts/niks/configuration.nix @@ -31,23 +31,6 @@ ]; }; - networking = { - networkmanager = { - enable = true; - dns = "systemd-resolved"; - }; - firewall.checkReversePath = "loose"; - }; - - services.resolved.enable = true; - - # don't wait for network to boot faster - # https://old.reddit.com/r/NixOS/comments/vdz86j/how_to_remove_boot_dependency_on_network_for_a - systemd = { - targets.network-online.wantedBy = lib.mkForce []; # default is [ "multi-user.target" ] - services.NetworkManager-wait-online.wantedBy = lib.mkForce []; # default is [ "network-online.target" ] - }; - time.timeZone = "Europe/Warsaw"; nix = { diff --git a/hosts/niks/profile.nix b/hosts/niks/profile.nix index d305bbb..faebf67 100644 --- a/hosts/niks/profile.nix +++ b/hosts/niks/profile.nix @@ -4,6 +4,7 @@ _: { ../../options/common/cpu/amd.nix ../../options/common/docs.nix ../../options/common/gpu/amd.nix + ../../options/common/networking.nix ../../options/common/oomd.nix ../../options/common/pin-registry.nix ../../options/common/preserve-system.nix diff --git a/options/common/networking.nix b/options/common/networking.nix new file mode 100644 index 0000000..8f97137 --- /dev/null +++ b/options/common/networking.nix @@ -0,0 +1,27 @@ +{ + lib, + ... +}: { + networking = { + networkmanager = { + enable = true; + dns = "systemd-resolved"; + }; + firewall.checkReversePath = "loose"; + }; + + services.resolved = { + enable = true; + fallbackDns = [ + "9.9.9.9" + "2620:fe::fe" + ]; + }; + + # don't wait for network to boot faster + # https://old.reddit.com/r/NixOS/comments/vdz86j/how_to_remove_boot_dependency_on_network_for_a + systemd = { + targets.network-online.wantedBy = lib.mkForce []; # default is [ "multi-user.target" ] + services.NetworkManager-wait-online.wantedBy = lib.mkForce []; # default is [ "network-online.target" ] + }; +}