diff --git a/flake.lock b/flake.lock index 8d8f74e..2379c35 100644 --- a/flake.lock +++ b/flake.lock @@ -11,11 +11,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1686593576, - "narHash": "sha256-Eh17opCI0YNjIwsWL8m4QzWRE462Zib4D0/W523uhTw=", + "lastModified": 1686907045, + "narHash": "sha256-FOI6xst+9iMkzAFVZxQqRzaTQW+zzHRzMavoVXIt7Xk=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "b769c7c0e616c238382d3dfe9c8e4cb7fdf3d1a3", + "rev": "12777320cdee6698e5901f6392ff85f939adf11a", "type": "github" }, "original": { @@ -32,11 +32,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1686550934, - "narHash": "sha256-lrVnI6o5IO/03vMUmVo72Zolzdee5ewjo82iu1KSLYM=", + "lastModified": 1686896497, + "narHash": "sha256-IphIS1KpiFXp/j0v7mEMhtw51uvU5F0mqF2j4//7VAA=", "owner": "nix-community", "repo": "fenix", - "rev": "75b8b8463ed9a41dc446c109ce6d615d15dff571", + "rev": "9c69d11badcd78710d7d8665bc3d2e1adc450ffe", "type": "github" }, "original": { @@ -135,11 +135,11 @@ "pre-commit-hooks-nix": "pre-commit-hooks-nix" }, "locked": { - "lastModified": 1686559216, - "narHash": "sha256-8yFA8F8dqUziMgd94DUSM4ljCgudcMYyWeaqdHFUvWE=", + "lastModified": 1686692834, + "narHash": "sha256-EFjJ/r4iYVKO+XdL15g9bzOKbCExTGeqNEVHSn0H7/E=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "59e3ebb19fdd3fd235d8275b008538a72872bad7", + "rev": "823ad6b70bf09b91c3a9dd9a64678ec80ba3c1ee", "type": "github" }, "original": { @@ -158,11 +158,11 @@ ] }, "locked": { - "lastModified": 1686444102, - "narHash": "sha256-6J+pkUauanh6qfvyD80ngYZSyUmdmngMaO4TFY2Z0OA=", + "lastModified": 1686877099, + "narHash": "sha256-z1LLYeKVKIGlI344kXB61LFjcfUJuN7uVoEEjdYjrCw=", "owner": "astro", "repo": "microvm.nix", - "rev": "551239936a1c86479f6026658c4d1f1a3635d286", + "rev": "4c5362ad0da3413e1e93a05c56e1ee2413cc89d2", "type": "github" }, "original": { @@ -173,11 +173,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686431482, - "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "lastModified": 1686736559, + "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1686431482, - "narHash": "sha256-oPVQ/0YP7yC2ztNsxvWLrV+f0NQ2QAwxbrZ+bgGydEM=", + "lastModified": 1686736559, + "narHash": "sha256-YyUSVoOKIDAscTx7IZhF9x3qgZ9dPNF19fKk+4c5irc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2", + "rev": "ddf4688dc7aeb14e8a3c549cb6aa6337f187a884", "type": "github" }, "original": { @@ -221,27 +221,27 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1686392259, - "narHash": "sha256-hqSS9hKhWldIZr1bBp9xKhIznnGPICGKzuehd2LH0UA=", + "lastModified": 1686885751, + "narHash": "sha256-KcbYp2KuKbXgNaYVziwKUc6AKRhgJ1G8Qq5gjAbQ3uw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ef24b2fa0c5f290a35064b847bc211f25cb85c88", + "rev": "aa4b53f79d961a7cbba0b24f791401a34c18011a", "type": "github" }, "original": { "owner": "NixOS", - "ref": "release-22.11", + "ref": "release-23.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1686501370, - "narHash": "sha256-G0WuM9fqTPRc2URKP9Lgi5nhZMqsfHGrdEbrLvAPJcg=", + "lastModified": 1686592866, + "narHash": "sha256-riGg89eWhXJcPNrQGcSwTEEm7CGxWC06oSX44hajeMw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "75a5ebf473cd60148ba9aec0d219f72e5cf52519", + "rev": "0eeebd64de89e4163f4d3cf34ffe925a5cf67a05", "type": "github" }, "original": { @@ -298,11 +298,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1686507294, - "narHash": "sha256-9ms5EHSQnEWg5MRWf/2KfEqmYdl4ZMYUTwrjSGFyXM0=", + "lastModified": 1686818168, + "narHash": "sha256-yyoJmC17T6mXqthzgGiTKSdUJ0cTEuqQmkmd3iW4ay8=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "d567091f472a6c2b55262e25d092f1d43a7a4fae", + "rev": "ff864fbb9fc21f0cdae408fe8f5b2f43141b45a7", "type": "github" }, "original": { @@ -320,11 +320,11 @@ "nixpkgs-stable": "nixpkgs-stable_3" }, "locked": { - "lastModified": 1686453485, - "narHash": "sha256-75iPAcS6xuw4SNfqLmFCi9wWG1JmDNKaC8l3WJUkmDk=", + "lastModified": 1686902322, + "narHash": "sha256-Vogj2MsipA+Uzr0M3d8300JeKQDHhPy6NEuTQXVdWu0=", "owner": "Mic92", "repo": "sops-nix", - "rev": "cb85e297937af1bd1434cf5f85a3f86a21dc8207", + "rev": "1e2bae54870a06aa9364f8d33a5b9a0869d792fc", "type": "github" }, "original": { diff --git a/hosts/cirrus/wireguard-server.nix b/hosts/cirrus/wireguard-server.nix index 526e8db..74e6091 100644 --- a/hosts/cirrus/wireguard-server.nix +++ b/hosts/cirrus/wireguard-server.nix @@ -5,6 +5,7 @@ # wireguards 51820 51821 + 34197 ]; allowedTCPPorts = [ # port forward ssh to music @@ -13,10 +14,12 @@ # port-forward ssh to the music machine extraCommands = '' iptables -t nat -I PREROUTING -p tcp --dport 2020 -j DNAT --to-destination 10.34.45.101:22 + iptables -t nat -I PREROUTING -p udp --dport 34197 -j DNAT --to-destination 10.34.45.111:34197 iptables ! -o lo -t nat -A POSTROUTING -j MASQUERADE ''; extraStopCommands = '' iptables -t nat -D PREROUTING -p tcp --dport 2020 -j DNAT --to-destination 10.34.45.101:22 || true + iptables -t nat -D PREROUTING -p udp --dport 34197 -j DNAT --to-destination 10.34.45.111:34197 || true ''; }; @@ -40,7 +43,6 @@ { # microwave wireguardPeerConfig = { - # nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI PublicKey = "0zpfcNrmbsNwwbnDDX4SMl4BVTB0zuhGKixT9TJQoHc="; AllowedIPs = [ "10.66.66.10/32" ]; PersistentKeepalive = 25; @@ -49,7 +51,6 @@ { # Dishwasher wireguardPeerConfig = { - # nextcloud down, have to keep things in here: https://www.youtube.com/watch?v=1c6v7j1TUBI PublicKey = "AdWUBbyeRkxdP9HUu25PpISoxbgQ8oeCw3BmV93xtAw="; AllowedIPs = [ "10.66.66.100/32" ]; PersistentKeepalive = 25; @@ -103,6 +104,13 @@ PersistentKeepalive = 25; }; } + { + wireguardPeerConfig = { + PublicKey = "6rwSThPEfTyYvMVSnHNcNPRntCHEQFyscF2SodI8A34="; + AllowedIPs = [ "10.34.45.111/32" ]; + PersistentKeepalive = 25; + }; + } ]; }; networks."oxaproxy" = {