diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/core/networking/default.nix | 28 | ||||
| -rw-r--r-- | modules/desktop/networking/default.nix | 28 | ||||
| -rw-r--r-- | modules/desktop/networking/loopback.nix (renamed from modules/core/networking/loopback.nix) | 0 |
3 files changed, 28 insertions, 28 deletions
diff --git a/modules/core/networking/default.nix b/modules/core/networking/default.nix index 2874fa3..1f59251 100644 --- a/modules/core/networking/default.nix +++ b/modules/core/networking/default.nix @@ -1,33 +1,5 @@ -{ secrets, ... }: { imports = [ - ./loopback.nix ./tailscale.nix ]; - - # https://discourse.nixos.org/t/rebuild-error-failed-to-start-network-manager-wait-online/41977/2 - systemd.network.wait-online.enable = false; - boot.initrd.systemd.network.wait-online.enable = false; - - # https://discourse.nixos.org/t/how-to-disable-networkmanager-wait-online-service-in-the-configuration-file/19963/2 - systemd.services.NetworkManager-wait-online.enable = false; - - networking = { - hostName = "kansai"; - nftables.enable = true; - - nameservers = [ - "45.90.28.0#${secrets.nextdns_id}.dns.nextdns.io" - "2a07:a8c0::#${secrets.nextdns_id}.dns.nextdns.io" - "45.90.30.0#${secrets.nextdns_id}.dns.nextdns.io" - "2a07:a8c1::#${secrets.nextdns_id}.dns.nextdns.io" - ]; - - timeServers = [ - "0.nixos.pool.ntp.org" - "1.nixos.pool.ntp.org" - "2.nixos.pool.ntp.org" - "3.nixos.pool.ntp.org" - ]; - }; } diff --git a/modules/desktop/networking/default.nix b/modules/desktop/networking/default.nix index 3148acd..060669a 100644 --- a/modules/desktop/networking/default.nix +++ b/modules/desktop/networking/default.nix @@ -1,3 +1,4 @@ +{ secrets, ... }: { imports = [ ./firewall @@ -5,6 +6,7 @@ ./dhcpcd.nix ./i2p.nix ./ipv6.nix + ./loopback.nix ./networkmanager.nix ./optimise.nix ./pia.nix @@ -12,4 +14,30 @@ ./tor.nix ./upnp.nix ]; + + # https://discourse.nixos.org/t/rebuild-error-failed-to-start-network-manager-wait-online/41977/2 + systemd.network.wait-online.enable = false; + boot.initrd.systemd.network.wait-online.enable = false; + + # https://discourse.nixos.org/t/how-to-disable-networkmanager-wait-online-service-in-the-configuration-file/19963/2 + systemd.services.NetworkManager-wait-online.enable = false; + + networking = { + hostName = "kansai"; + nftables.enable = true; + + nameservers = [ + "45.90.28.0#${secrets.nextdns_id}.dns.nextdns.io" + "2a07:a8c0::#${secrets.nextdns_id}.dns.nextdns.io" + "45.90.30.0#${secrets.nextdns_id}.dns.nextdns.io" + "2a07:a8c1::#${secrets.nextdns_id}.dns.nextdns.io" + ]; + + timeServers = [ + "0.nixos.pool.ntp.org" + "1.nixos.pool.ntp.org" + "2.nixos.pool.ntp.org" + "3.nixos.pool.ntp.org" + ]; + }; } diff --git a/modules/core/networking/loopback.nix b/modules/desktop/networking/loopback.nix index 62e745e..62e745e 100644 --- a/modules/core/networking/loopback.nix +++ b/modules/desktop/networking/loopback.nix |