From 40185984510eb6061a9e4975fe1d8e3626d76d54 Mon Sep 17 00:00:00 2001 From: auto-upgrade Date: Tue, 26 May 2026 16:29:18 -0300 Subject: [PATCH 1/2] flake.lock: Update MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Flake lock file updates: • Updated input 'zen-browser': 'github:youwen5/zen-browser-flake/90d4d395e2be09b2d314816dadd34660528c4ee4?narHash=sha256-hJlFMK7Es783KU/mhLEGC%2Bxim/EqBMVdbsWgthquo6Y%3D' (2026-05-15) → 'github:youwen5/zen-browser-flake/3ff570b75cf068b0f25d0c2b3a77a0e546a4067b?narHash=sha256-4bQ5dL7zbP2vKu5kfsEJICxGG3ATsOW7sP2QvaXGkHM%3D' (2026-05-26) --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3caa825..c3298bc 100644 --- a/flake.lock +++ b/flake.lock @@ -317,11 +317,11 @@ ] }, "locked": { - "lastModified": 1778822459, - "narHash": "sha256-hJlFMK7Es783KU/mhLEGC+xim/EqBMVdbsWgthquo6Y=", + "lastModified": 1779773014, + "narHash": "sha256-4bQ5dL7zbP2vKu5kfsEJICxGG3ATsOW7sP2QvaXGkHM=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "90d4d395e2be09b2d314816dadd34660528c4ee4", + "rev": "3ff570b75cf068b0f25d0c2b3a77a0e546a4067b", "type": "github" }, "original": { From 6b3f8709a1d3f7b31b30b760a703fd3d3cf830c4 Mon Sep 17 00:00:00 2001 From: ltadeu6 Date: Tue, 26 May 2026 17:42:40 -0300 Subject: [PATCH 2/2] Add Tailscale, remove WireGuard and old VPS references - Enable Tailscale on NixOracle and Nixos - Add SSH matchBlock for Termux (pixel-7a, port 8022) - Remove extraHosts entries for vps and NixOracle - Remove WireGuard config, secrets and age key Co-Authored-By: Claude Sonnet 4.6 --- home/ltadeu6.nix | 12 ++++++++++++ hosts/NixOracle/configuration.nix | 4 ++++ hosts/Nixos/configuration.nix | 23 ++--------------------- secrets/secrets.nix | 6 ------ secrets/wireguard_private_key.age | Bin 366 -> 0 bytes 5 files changed, 18 insertions(+), 27 deletions(-) delete mode 100644 secrets/wireguard_private_key.age diff --git a/home/ltadeu6.nix b/home/ltadeu6.nix index 1b65ba8..6f5a119 100644 --- a/home/ltadeu6.nix +++ b/home/ltadeu6.nix @@ -467,4 +467,16 @@ PY }; programs.home-manager.enable = true; + + programs.ssh = { + enable = true; + enableDefaultConfig = false; + matchBlocks = { + termux = { + hostname = "pixel-7a"; + user = "u0_a254"; + port = 8022; + }; + }; + }; } diff --git a/hosts/NixOracle/configuration.nix b/hosts/NixOracle/configuration.nix index 1dd2d7d..528a22b 100644 --- a/hosts/NixOracle/configuration.nix +++ b/hosts/NixOracle/configuration.nix @@ -83,7 +83,11 @@ in { c.PasswordIdentityProvider.password_required = True ''; + services.tailscale.enable = true; + networking.firewall.allowedTCPPorts = [ 80 443 ]; + networking.firewall.allowedUDPPorts = [ 41641 ]; + networking.firewall.trustedInterfaces = [ "tailscale0" ]; security.acme = { acceptTerms = true; diff --git a/hosts/Nixos/configuration.nix b/hosts/Nixos/configuration.nix index fd912ec..3fc64dd 100644 --- a/hosts/Nixos/configuration.nix +++ b/hosts/Nixos/configuration.nix @@ -337,9 +337,6 @@ in { (builtins.pathExists ../../secrets/minecraft_rcon_password.age) { minecraft_rcon_password.file = ../../secrets/minecraft_rcon_password.age; - } // lib.optionalAttrs - (builtins.pathExists ../../secrets/wireguard_private_key.age) { - wireguard_private_key.file = ../../secrets/wireguard_private_key.age; }; }; @@ -377,6 +374,8 @@ in { ]; }; + services.tailscale.enable = true; + networking = { hostName = "Nixos"; # Define your hostname. networkmanager.enable = true; @@ -389,24 +388,6 @@ in { }; defaultGateway = "192.168.1.1"; nameservers = [ "8.8.8.8" "1.1.1.1" ]; - extraHosts = '' - 191.252.194.81 vps - 204.216.130.111 NixOracle - ''; - # Enable WireGuard - # wireguard.interfaces = { - # wg0 = { - # ips = [ "10.0.0.2/24" ]; - # listenPort = 51820; - # privateKey = builtins.readFile config.age.secrets.wireguard_private_key.path; - # peers = [{ - # publicKey = (import ../../secrets/secrets.nix).wireguard.peerPublicKey; - # allowedIPs = [ "10.0.0.1" ]; - # endpoint = (import ../../secrets/secrets.nix).wireguard.endpoint; - # persistentKeepalive = 25; - # }]; - # }; - # }; }; time.timeZone = "America/Sao_Paulo"; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index c3ae664..6dc452a 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -19,10 +19,4 @@ in { "secrets/cloudflare_worker_api_token.age".publicKeys = [ users.ltadeu6 systems.Nixos ]; "secrets/cloudflare_dns_api_token.age".publicKeys = [ users.ltadeu6 systems.Nixos ]; "secrets/minecraft_rcon_password.age".publicKeys = [ users.ltadeu6 systems.Nixos ]; - "secrets/wireguard_private_key.age".publicKeys = [ users.ltadeu6 systems.Nixos ]; - - wireguard = { - peerPublicKey = "SZa3sH9QzjuhAzSFDybLbOxr3UxwPzV3SaiNLaJIjz0="; - endpoint = "vps32536.publiccloud.com.br:51820"; - }; } diff --git a/secrets/wireguard_private_key.age b/secrets/wireguard_private_key.age deleted file mode 100644 index 895dd065aeed123984225ddf62c37efcffd35ce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 366 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCR+@F{k2E?3Am$}Nlx z&N9j^EjKbwP0WZa%SkKFDl>5@FV1rh$}Nr14#_F>%&E{e4CFHLN%C?wcM37dcgr*k zD+tPUGIsF`_i*y`%JIzCHc85kv@FcF2r4%ZD#l@(MRIb4n}uhQevq$Auy2TEWTi=x zpJ| sMDSy7?Dc&8hx&Faxw6GI7S7!0^}_Ss?7L;I-~1)H4g_qm*~ZWc00Q}ZoB#j-