diff --git a/hosts/kitty/network/default.nix b/hosts/kitty/network/default.nix index 7775a2fe..84a3df61 100644 --- a/hosts/kitty/network/default.nix +++ b/hosts/kitty/network/default.nix @@ -9,14 +9,5 @@ address = "10.1.0.1"; interface = "eno1"; }; - - vlans.internal = { - id=100; - interface="eno1"; - }; - interfaces.internal.ipv4.addresses = [{ - address = "11.0.0.2"; - prefixLength = 8; - }]; }; } diff --git a/hosts/midas/network/default.nix b/hosts/midas/network/default.nix index 332d8b2e..d3053f3d 100644 --- a/hosts/midas/network/default.nix +++ b/hosts/midas/network/default.nix @@ -9,33 +9,6 @@ address = "10.1.0.1"; interface = "enp0s31f6"; }; - - vlans.internal = { - id=100; - interface="enp0s31f6"; - }; - interfaces.internal.ipv4.addresses = [{ - address = "11.0.0.1"; - prefixLength = 8; - }]; - - nftables.tables.forwarding = { - family = "inet"; - content = '' - chain incoming { - type nat hook prerouting priority dstnat; policy accept; - tcp dport 2211 dnat ip to 11.0.0.100:22 comment "Tower SSH" - tcp dport 2222 dnat ip to 11.0.0.2:22 comment "Kitty SSH" - - udp dport { 27005, 27015 } dnat ip to 11.0.0.100 comment "PC Hosted Games" - } - - chain forward { - type nat hook postrouting priority 100; policy accept; - masquerade - } - ''; - }; }; # Enable IP forwarding for the server configuration diff --git a/hosts/tower/network/default.nix b/hosts/tower/network/default.nix index a14294f2..ace220c6 100644 --- a/hosts/tower/network/default.nix +++ b/hosts/tower/network/default.nix @@ -10,15 +10,6 @@ interface = "enp42s0"; }; - vlans.internal = { - id=100; - interface="enp42s0"; - }; - interfaces.internal.ipv4.addresses = [{ - address = "11.0.0.100"; - prefixLength = 8; - }]; - firewall.allowedUDPPorts = [ 27015 ]; }; } diff --git a/modules/home/programs/gui/librewolf/default.nix b/modules/home/programs/gui/librewolf/default.nix index 9ea04edb..e28e01ac 100644 --- a/modules/home/programs/gui/librewolf/default.nix +++ b/modules/home/programs/gui/librewolf/default.nix @@ -6,8 +6,8 @@ package = pkgs.librewolf; profiles.default = { isDefault = true; - containersForce = true; + containersForce = true; containers = { home = { color = "purple"; @@ -21,26 +21,56 @@ }; }; - extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [ - bitwarden - darkreader - return-youtube-dislikes - simple-tab-groups - sponsorblock - ublock-origin - violentmonkey - ]; + bookmarks = { + force = true; + settings = [ + { + name = "NixFox"; + url = "https://www.nixfox.ca"; + } + { + name = "Luna"; + url = "https://www.lunamoonlight.xyz"; + } + { + name = "Freecorn"; + url = "https://freecorn1854.win"; + } + { + name = "Bloxelcom"; + url = "https://www.bloxelcom.net"; + } + { + name = "YouTube"; + url = "https://www.kernel.org"; + } + { + name = "NixOS Wiki"; + url = "https://nixos.wiki"; + } + { + name = "Kernel"; + url = "https://www.kernel.org"; + } + ]; + }; + + extensions = { + force = true; + packages = with pkgs.nur.repos.rycee.firefox-addons; [ + bitwarden + darkreader + return-youtube-dislikes + simple-tab-groups + sponsorblock + ublock-origin + violentmonkey + ]; + }; search = { force = true; default = "ecosia"; - order = [ - "ecosia" - "nixpkgs" - "mynixos" - "youtube" - "spotify" - ]; engines = { "ecosia" = { urls = [{ @@ -166,7 +196,6 @@ "privacy.clearOnShutdown.cookies" = false; "privacy.clearOnShutdown_v2.cookiesAndStorage" = false; "privacy.fingerprintingProtection" = true; - "privacy.firstparty.isolate" = true; "privacy.globalprivacycontrol.enabled" = true; "privacy.globalprivacycontrol.functionality.enabled" = true; "privacy.resistFingerprinting" = true; diff --git a/modules/system/devices/networking/default.nix b/modules/system/devices/networking/default.nix index 8e6944f9..5ac70401 100644 --- a/modules/system/devices/networking/default.nix +++ b/modules/system/devices/networking/default.nix @@ -1,6 +1,7 @@ { config, ... }: { imports = [ + ./mycelium ./nameservers ./wireless ]; diff --git a/modules/system/devices/networking/mycelium/default.nix b/modules/system/devices/networking/mycelium/default.nix new file mode 100644 index 00000000..0d178877 --- /dev/null +++ b/modules/system/devices/networking/mycelium/default.nix @@ -0,0 +1,16 @@ +{ ... }: +{ + services.mycelium = { + enable = true; + openFirewall = true; + addHostedPublicNodes = false; + peers = [ + "quic://[2607:fea8:431d:cba5:16bf:db31:5797:4170]:9651" + "quic://[2607:fea8:431d:cba5:d104:b60a:c847:9797]:9651" + "quic://[2607:fea8:431d:cba5:1963:58fa:50f4:f841]:9651" + "quic://150.230.26.224:9651" + ]; + }; + + environment.persistence."/persist".directories = [ "/var/lib/private/mycelium" ]; +}