diff --git a/nix/os/devices/router0-dmz0/configuration.nix b/nix/os/devices/router0-dmz0/configuration.nix index 7395600..4c8b5ee 100644 --- a/nix/os/devices/router0-dmz0/configuration.nix +++ b/nix/os/devices/router0-dmz0/configuration.nix @@ -384,6 +384,10 @@ in systemd.network = { wait-online.anyInterface = true; + config.networkConfig = { + IPv4Forwarding = true; + IPv6Forwarding = true; + }; netdevs = let router0-ifog_wg0Endpoint = "${repoFlake.colmena.router0-ifog.deployment.targetHost}:${builtins.toString repoFlake.nixosConfigurations.router0-ifog.config.systemd.network.netdevs.wg0.wireguardConfig.ListenPort}"; @@ -537,7 +541,6 @@ in DHCP = true; DNSOverTLS = true; DNSSEC = true; - IPForward = true; # accept Router Advertisements for Stateless IPv6 Autoconfiguraton (SLAAC) IPv6AcceptRA = true; diff --git a/nix/os/devices/router0-dmz0/flake.lock b/nix/os/devices/router0-dmz0/flake.lock index 33a204d..6fe1eed 100644 --- a/nix/os/devices/router0-dmz0/flake.lock +++ b/nix/os/devices/router0-dmz0/flake.lock @@ -28,11 +28,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1732221404, + "narHash": "sha256-fWTyjgGt+BHmkeJ5IxOR4zGF4/uc+ceWmhBjOBSVkgQ=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "97c0c4d7072f19b598ed332e9f7f8ad562c6885b", "type": "github" }, "original": { @@ -63,16 +63,16 @@ ] }, "locked": { - "lastModified": 1726989464, - "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "lastModified": 1731880681, + "narHash": "sha256-FmYTkIyPBUxSWgA7DPIVTsCCMvSSbs56yOtHpLNSnKg=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "rev": "aecd341dfead1c3ef7a3c15468ecd71e8343b7c6", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.05", + "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -80,11 +80,11 @@ "hostapd": { "flake": false, "locked": { - "lastModified": 1727905939, - "narHash": "sha256-LZHwXN8lBcDpKQVB3GcYI0SVzj6WXd2E0GDqhQh503w=", + "lastModified": 1732101105, + "narHash": "sha256-u/n1vkmRBpcq669kXpCdgfF5I+gL7DkV/0wWhyc2sSA=", "ref": "refs/heads/main", - "rev": "d84323d05ef30cdcf343884ac34420caf72145bd", - "revCount": 19910, + "rev": "25d29d65aa6df173eb9f6b44d4dc0536df66b4ba", + "revCount": 20028, "type": "git", "url": "git://w1.fi/hostap.git?branch=main" }, @@ -121,43 +121,43 @@ ] }, "locked": { - "lastModified": 1723893138, - "narHash": "sha256-TCGUFSBIaItvaFa+ydPII+Ayrn3OHfV1220RLgtWh5s=", + "lastModified": 1732269090, + "narHash": "sha256-tISFHFFb96UbgFZ3a36q2lfaKcXzxAyVt50GykfSqUM=", "owner": "steveej-forks", "repo": "nakato_nixos-sbc", - "rev": "5fb94671a47229e269383e736cb1764c94803ebb", + "rev": "e67d80bf50a725ff3b0003d92f9280a33dbf8967", "type": "github" }, "original": { "owner": "steveej-forks", - "ref": "kernel-6.10_and_cross-compile_mtkbump", + "ref": "wifi-workaround", "repo": "nakato_nixos-sbc", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1728067476, - "narHash": "sha256-/uJcVXuBt+VFCPQIX+4YnYrHaubJSx4HoNsJVNRgANM=", + "lastModified": 1731755305, + "narHash": "sha256-v5P3dk5JdiT+4x69ZaB18B8+Rcu3TIOrcdG4uEX7WZ8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "6e6b3dd395c3b1eb9be9f2d096383a8d05add030", + "rev": "057f63b6dc1a2c67301286152eb5af20747a9cb4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-24.05", + "ref": "nixos-24.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1732014248, + "narHash": "sha256-y/MEyuJ5oBWrWAic/14LaIr/u5E0wRVzyYsouYY3W6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "23e89b7da85c3640bbc2173fe04f4bd114342367", "type": "github" }, "original": { @@ -206,11 +206,11 @@ ] }, "locked": { - "lastModified": 1728127082, - "narHash": "sha256-MDU/aVPcR5Fk+x1B+SAsyYG47k5cvFvGTrqZIev2Jck=", + "lastModified": 1732050592, + "narHash": "sha256-WuGCnlt1xhHJfsHpPXdV3gH9Khe4gJ1+abWCHFcddvM=", "owner": "numtide", "repo": "srvos", - "rev": "7aaa72eb804248436ea20c084a7891a383e23b02", + "rev": "be4533b50ac69cd871ab73d4101c47b397b8c143", "type": "github" }, "original": { diff --git a/nix/os/devices/router0-dmz0/flake.nix b/nix/os/devices/router0-dmz0/flake.nix index fc8504b..3ed95ae 100644 --- a/nix/os/devices/router0-dmz0/flake.nix +++ b/nix/os/devices/router0-dmz0/flake.nix @@ -1,11 +1,11 @@ { inputs = { - nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; get-flake.url = "github:ursi/get-flake"; - home-manager.url = "github:nix-community/home-manager/release-24.05"; + home-manager.url = "github:nix-community/home-manager/release-24.11"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; disko.url = "github:nix-community/disko"; @@ -17,7 +17,7 @@ # "github:nakato/nixos-sbc" # "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile" # "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile" - "github:steveej-forks/nakato_nixos-sbc/kernel-6.10_and_cross-compile_mtkbump" + "github:steveej-forks/nakato_nixos-sbc/wifi-workaround" # "git+file:///home/steveej/src/others/nakato_nixos-sbc/" ; nixos-sbc.inputs.nixpkgs.follows = "nixpkgs"; @@ -37,6 +37,8 @@ # url = "file+https://raw.githubusercontent.com/openwrt/openwrt/847984c773d819d5579d5abae4b80a4983103ed9/package/network/services/hostapd/patches/710-vlan_no_bridge.patch"; # flake = false; # }; + + # repoFlake.url = "path:../../../.."; }; outputs = @@ -63,6 +65,8 @@ inherit nodeName; repoFlake = get-flake ../../../..; + # repoFlake = get-flake ./.; + # repoFlake = self.inputs.repoFlake; nodeFlake = self; }).meta.nodeSpecialArgs.${nodeName};