From a8ff34b8201dca020c92b3f2918cb530f387a71e Mon Sep 17 00:00:00 2001 From: Stefan Junker Date: Fri, 26 Jul 2024 14:01:59 +0200 Subject: [PATCH] router0-dmz0: update and tweak wifi --- .sops.yaml | 2 +- nix/os/devices/router0-dmz0/configuration.nix | 34 ++++---- nix/os/devices/router0-dmz0/flake.lock | 81 +++++++------------ nix/os/devices/router0-dmz0/flake.nix | 10 +-- 4 files changed, 53 insertions(+), 74 deletions(-) diff --git a/.sops.yaml b/.sops.yaml index 8f66652..b807986 100644 --- a/.sops.yaml +++ b/.sops.yaml @@ -15,7 +15,7 @@ keys: - &sj-vps-htz0 age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - &sj-srv1 age18dmqd7r7fanrfmdxsvwgv9psvhs3hw5ydpvw0na0dv3dlrg4rs3q2wpvgv - &srv0-dmz0 age13cyvxrd28j68f97q2dwsn62q5dy8tdxtq86ql2dxv2ncwfrf63dsmkj7n3 - - &router0-dmz0 age1k7cejd9tqz6a3expd63wkn7kmeawhhrp9vy5vevhjn6eavhdwywqeh7j86 + - &router0-dmz0 age1vr69hfmjgkqu47g5hjacet6n2tq4rhwnvdrmfa6n6l7fkqvvafnsaccf8u - &router0-ifog age1dktk5glcuu34u9t6kp3g2vqyj7dy0elray38t8n75mwa6l0s0vdst2cy00 - &router0-hosthatch age1v458x2q70yt0a6m6cq5ehemphtrzfzyhmeg3r872vsyyf65asgwstmqqk4 - &hstk0 age10xwq7a4y256yhv02j0u80te0vt4krgfjc68r0uw07t96z7ggmpwqtv38a0 diff --git a/nix/os/devices/router0-dmz0/configuration.nix b/nix/os/devices/router0-dmz0/configuration.nix index 06715a1..1486713 100644 --- a/nix/os/devices/router0-dmz0/configuration.nix +++ b/nix/os/devices/router0-dmz0/configuration.nix @@ -770,13 +770,13 @@ in { ]; routes = [ - { - routeConfig = { - # test the set uprouting to a specific IP - Destination = "${repoFlake.colmena.sj-bm-hostkey0.deployment.targetHost}/32"; - MultiPathRoute = "10.0.0.0 1"; - }; - } + # { + # routeConfig = { + # # test the set uprouting to a specific IP + # Destination = "${repoFlake.colmena.sj-bm-hostkey0.deployment.targetHost}/32"; + # MultiPathRoute = "10.0.0.0 1"; + # }; + # } ]; }; "50-wg1" = { @@ -786,12 +786,12 @@ in { "10.0.0.3/31" ]; routes = [ - { - routeConfig = { - Destination = "${repoFlake.colmena.sj-bm-hostkey0.deployment.targetHost}/32"; - MultiPathRoute = "10.0.0.2 1"; - }; - } + # { + # routeConfig = { + # Destination = "${repoFlake.colmena.sj-bm-hostkey0.deployment.targetHost}/32"; + # MultiPathRoute = "10.0.0.2 1"; + # }; + # } ]; }; @@ -904,7 +904,8 @@ in { in { wlan0 = { band = "2g"; - countryCode = "CH"; + # FIXME: apparently setting this could cause bugs, testing disabling it for a while. + # countryCode = "CH"; channel = 0; # 0 would mean Automatic Channel Selection settings = { @@ -1047,6 +1048,11 @@ in { ieee8021x = 1; eap_server = 1; + + multicast_to_unicast = 0; + + skip_inactivity_poll = 0; + disassoc_low_ack = 0; }; }; diff --git a/nix/os/devices/router0-dmz0/flake.lock b/nix/os/devices/router0-dmz0/flake.lock index ba9afef..ac9c8e0 100644 --- a/nix/os/devices/router0-dmz0/flake.lock +++ b/nix/os/devices/router0-dmz0/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "bpir3": { - "inputs": { - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712309414, - "narHash": "sha256-Z1bK3rlZhI1qVDU3qS4cqZBIQL2xomtUPYHdxQgRuw0=", - "owner": "steveej-forks", - "repo": "nixos-bpir3", - "rev": "4cfe402142e6ef76d83fcd7c92d75029a39d3997", - "type": "github" - }, - "original": { - "owner": "steveej-forks", - "ref": "pr_kernel_config_for_nixpkgs_update", - "repo": "nixos-bpir3", - "type": "github" - } - }, "dependencyDagOfSubmodule": { "inputs": { "nixpkgs": [ @@ -49,11 +28,11 @@ ] }, "locked": { - "lastModified": 1714405407, - "narHash": "sha256-h3pOvHCXkSdp1KOZqtkQmHgkR7VaOJXDhqhumk7sZLY=", + "lastModified": 1720661479, + "narHash": "sha256-nsGgA14vVn0GGiqEfomtVgviRJCuSR3UEopfP8ixW1I=", "owner": "nix-community", "repo": "disko", - "rev": "5eaf747af38dd272e1ab28a8ec4bd972424b07cf", + "rev": "786965e1b1ed3fd2018d78399984f461e2a44689", "type": "github" }, "original": { @@ -84,11 +63,11 @@ ] }, "locked": { - "lastModified": 1716736833, - "narHash": "sha256-rNObca6dm7Qs524O4st8VJH6pZ/Xe1gxl+Rx6mcWYo0=", + "lastModified": 1720042825, + "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=", "owner": "nix-community", "repo": "home-manager", - "rev": "a631666f5ec18271e86a5cde998cba68c33d9ac6", + "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073", "type": "github" }, "original": { @@ -101,11 +80,11 @@ "hostapd": { "flake": false, "locked": { - "lastModified": 1713985129, - "narHash": "sha256-TBC+vZMFPApHAlw5FDPGqgZeYNskdvF56mJsSBoAm1M=", + "lastModified": 1720791870, + "narHash": "sha256-8dEM8oXfFngxdumug+soQqeXefej3WC/kgv8aLmGvNk=", "ref": "refs/heads/main", - "rev": "1dda619ed291edddf979d4513ddc59abf0a30c9e", - "revCount": 19546, + "rev": "7b8517d1974fa728e07dabcbd788c6ef6a8a96dd", + "revCount": 19652, "type": "git", "url": "git://w1.fi/hostap.git?branch=main" }, @@ -122,11 +101,11 @@ ] }, "locked": { - "lastModified": 1709392539, - "narHash": "sha256-cZ7vOO5KmvVQMHnpi1hBX+bUJlVL6cK8I3m2SPHANtg=", + "lastModified": 1715521768, + "narHash": "sha256-BQkkBqDemoPRd2a4G94I9w9fNE0IxWtVsQ9SalnNqCQ=", "owner": "thelegy", "repo": "nixos-nftables-firewall", - "rev": "412ea84967cd087fc668ef6994f419bd16ac1174", + "rev": "2c5a19966b4dfc5ca92df7eb250c68f90be653c8", "type": "github" }, "original": { @@ -142,27 +121,26 @@ ] }, "locked": { - "lastModified": 1717352972, - "narHash": "sha256-nMLhyLen1Q7+8Bchr4rxC6dGze2+Bxm2jIxuAAKrC7w=", - "owner": "steveej-forks", - "repo": "nakato_nixos-sbc", - "rev": "b04407e73daf3ac9f6eea161b74f8cf990666fe0", + "lastModified": 1720165368, + "narHash": "sha256-gTTaQoMeD9s0X/qvzkfnQ6IyYP7qam406sXQ8sbq1P0=", + "owner": "nakato", + "repo": "nixos-sbc", + "rev": "ddb8f1a16f1b6ebb32cb7b13125e45d65673905e", "type": "github" }, "original": { - "owner": "steveej-forks", - "ref": "kernel-6.9_and_cross-compile", - "repo": "nakato_nixos-sbc", + "owner": "nakato", + "repo": "nixos-sbc", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1717144377, - "narHash": "sha256-F/TKWETwB5RaR8owkPPi+SPJh83AQsm6KrQAlJ8v/uA=", + "lastModified": 1720691131, + "narHash": "sha256-CWT+KN8aTPyMIx8P303gsVxUnkinIz0a/Cmasz1jyIM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", + "rev": "a046c1202e11b62cbede5385ba64908feb7bfac4", "type": "github" }, "original": { @@ -174,11 +152,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1716948383, - "narHash": "sha256-SzDKxseEcHR5KzPXLwsemyTR/kaM9whxeiJohbL04rs=", + "lastModified": 1720542800, + "narHash": "sha256-ZgnNHuKV6h2+fQ5LuqnUaqZey1Lqqt5dTUAiAnqH0QQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ad57eef4ef0659193044870c731987a6df5cf56b", + "rev": "feb2849fdeb70028c70d73b848214b00d324a497", "type": "github" }, "original": { @@ -208,7 +186,6 @@ }, "root": { "inputs": { - "bpir3": "bpir3", "disko": "disko", "get-flake": "get-flake", "home-manager": "home-manager", @@ -228,11 +205,11 @@ ] }, "locked": { - "lastModified": 1714444742, - "narHash": "sha256-FOWYXEEtwYKAGmXgKVYli/VsA8XpeR+4wNKt+3M/9b4=", + "lastModified": 1720691926, + "narHash": "sha256-VE9ZfWRbyBjps5GV8KXiF8XodAykmwRpcJtPiVWCu8M=", "owner": "numtide", "repo": "srvos", - "rev": "b18e74f2245eaae150bc753821079c2512fe1516", + "rev": "e3e8ff545ef14f13c69a0f743078637fde952018", "type": "github" }, "original": { diff --git a/nix/os/devices/router0-dmz0/flake.nix b/nix/os/devices/router0-dmz0/flake.nix index f1b6a04..c177972 100644 --- a/nix/os/devices/router0-dmz0/flake.nix +++ b/nix/os/devices/router0-dmz0/flake.nix @@ -13,14 +13,10 @@ srvos.url = "github:numtide/srvos"; srvos.inputs.nixpkgs.follows = "nixpkgs"; - bpir3.url = - "github:steveej-forks/nixos-bpir3/pr_kernel_config_for_nixpkgs_update" - # "/home/steveej/src/steveej/nixos-bpir3" + nixos-sbc.url = + "github:nakato/nixos-sbc" + # "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile" ; - - bpir3.inputs.nixpkgs.follows = "nixpkgs"; - - nixos-sbc.url = "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile"; nixos-sbc.inputs.nixpkgs.follows = "nixpkgs"; nixos-nftables-firewall.url = "github:thelegy/nixos-nftables-firewall";