diff --git a/flake.nix b/flake.nix index 888db9c..bf6d4fe 100644 --- a/flake.nix +++ b/flake.nix @@ -67,6 +67,7 @@ ./nixos/configuration.nix ./nixos/kde-desktop.nix ./nixos/cad.nix + ./nixos/zerotier.nix ]; }; #Work laptop, dell g15. diff --git a/nixos/kde-desktop.nix b/nixos/kde-desktop.nix index c92e978..7a9e52d 100644 --- a/nixos/kde-desktop.nix +++ b/nixos/kde-desktop.nix @@ -27,10 +27,7 @@ pkgs.hunspell pkgs.hunspellDicts.en_CA pkgs.hunspellDicts.en_US - pkgs.openscad pkgs.inkscape - pkgs.blender - pkgs.freecad pkgs.gimp pkgs.krita ]; @@ -54,7 +51,7 @@ "widget.use-xdg-desktop-portal.file-picker" = 1; }; ExtensionSettings = { - #"*".installation_mode = "blocked"; # blocks all addons except the ones specified below + "*".installation_mode = "allowed"; # uBlock Origin: "uBlock0@raymondhill.net" = { install_url = "https://addons.mozilla.org/firefox/downloads/latest/ublock-origin/latest.xpi"; diff --git a/nixos/zerotier.nix b/nixos/zerotier.nix new file mode 100644 index 0000000..d695271 --- /dev/null +++ b/nixos/zerotier.nix @@ -0,0 +1,19 @@ +let + privateZeroTierInterfaces = [ "ztmwri5sbj" ]; # ZT NET INTERFACE +in { + + networking.firewall.trustedInterfaces = privateZeroTierInterfaces; # TRUST VPN ONLY + + services.avahi.enable = true; + services.avahi.allowInterfaces = privateZeroTierInterfaces; # ONLY BROADCAST ON VPN + services.avahi.ipv6 = true; + services.avahi.publish.enable = true; + services.avahi.publish.userServices = true; + services.avahi.publish.addresses = true; + services.avahi.publish.domain = true; + services.avahi.nssmdns4 = true; + services.avahi.publish.workstation = true; # ADDED TO DESKTOP MACHINES + + services.zerotierone.enable = true; + services.zerotierone.joinNetworks = [ "e04fa485ed2a4dc4" ]; # ZT NETWORK ID +}