From 1ff23133ff4ccdb097f7a38c28544180937a9b38 Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Wed, 15 Jan 2025 19:21:06 -0500 Subject: Move Networking.nix under Lithium This should have been done before as it only pertains to Lithium. --- Omni/Dev/Lithium.nix | 2 +- Omni/Dev/Lithium/Networking.nix | 42 +++++++++++++++++++++++++++++++++++++++++ Omni/Dev/Networking.nix | 42 ----------------------------------------- 3 files changed, 43 insertions(+), 43 deletions(-) create mode 100644 Omni/Dev/Lithium/Networking.nix delete mode 100644 Omni/Dev/Networking.nix (limited to 'Omni/Dev') diff --git a/Omni/Dev/Lithium.nix b/Omni/Dev/Lithium.nix index 3063b1b..2b9f16a 100755 --- a/Omni/Dev/Lithium.nix +++ b/Omni/Dev/Lithium.nix @@ -8,8 +8,8 @@ bild.os { ../Users.nix ./Lithium/Configuration.nix ./Lithium/Hardware.nix + ./Lithium/Networking.nix ./Hoogle.nix - ./Networking.nix ./Dns.nix #./Guix.nix # I need to package a bunch of guile libs first ./Vpn.nix diff --git a/Omni/Dev/Lithium/Networking.nix b/Omni/Dev/Lithium/Networking.nix new file mode 100644 index 0000000..f6c242f --- /dev/null +++ b/Omni/Dev/Lithium/Networking.nix @@ -0,0 +1,42 @@ +{...}: let + ports = import ../../Cloud/Ports.nix; +in { + networking = { + nameservers = ["1.1.1.1"]; + hostName = "lithium"; + hosts = {"::1" = ["localhost" "ipv6-localhost" "ipv6-loopback"];}; + + firewall = { + allowedTCPPorts = [ + ports.bitcoind + ports.bitcoind-rpc + ports.delugeWeb + ports.et + ports.gemini + ports.git + ports.http + ports.https + ports.jellyfin + ports.jupyter + ports.k3s + ports.mpd + ports.mpd-stream + ports.murmur + ports.radicale + ports.sabten + ports.ssh + ports.stableDiffusion + ports.tor + ]; + allowedTCPPortRanges = [ports.torrents ports.httpdev]; + allowedUDPPorts = [ports.dns ports.et ports.murmur]; + allowedUDPPortRanges = [ports.torrents]; + }; + + # The global useDHCP flag is deprecated, therefore explicitly set to false here. + # Per-interface useDHCP will be mandatory in the future, so this generated config + # replicates the default behaviour. + useDHCP = false; + interfaces.enp2s0.useDHCP = true; + }; +} diff --git a/Omni/Dev/Networking.nix b/Omni/Dev/Networking.nix deleted file mode 100644 index f7ea6e3..0000000 --- a/Omni/Dev/Networking.nix +++ /dev/null @@ -1,42 +0,0 @@ -{...}: let - ports = import ../Cloud/Ports.nix; -in { - networking = { - nameservers = ["1.1.1.1"]; - hostName = "lithium"; - hosts = {"::1" = ["localhost" "ipv6-localhost" "ipv6-loopback"];}; - - firewall = { - allowedTCPPorts = [ - ports.bitcoind - ports.bitcoind-rpc - ports.delugeWeb - ports.et - ports.gemini - ports.git - ports.http - ports.https - ports.jellyfin - ports.jupyter - ports.k3s - ports.mpd - ports.mpd-stream - ports.murmur - ports.radicale - ports.sabten - ports.ssh - ports.stableDiffusion - ports.tor - ]; - allowedTCPPortRanges = [ports.torrents ports.httpdev]; - allowedUDPPorts = [ports.dns ports.et ports.murmur]; - allowedUDPPortRanges = [ports.torrents]; - }; - - # The global useDHCP flag is deprecated, therefore explicitly set to false here. - # Per-interface useDHCP will be mandatory in the future, so this generated config - # replicates the default behaviour. - useDHCP = false; - interfaces.enp2s0.useDHCP = true; - }; -} -- cgit v1.2.3