From 0fb44b2a894221e5806ee9eaa287df77a72b9204 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Wed, 2 Oct 2024 09:30:18 +0200 Subject: nixos: move WiFi macs to private repository MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thanks for Joel Koen for pushing me to do this finally. 😊 --- flake.lock | 26 +++++++++++++------------- nixos/configurations/adm-omnia.nix | 4 ++-- nixos/configurations/adm-omnia2.nix | 4 ++-- nixos/configurations/spt-mox.nix | 2 +- nixos/configurations/spt-mox2.nix | 2 +- nixos/configurations/spt-omnia.nix | 4 ++-- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/flake.lock b/flake.lock index 1146d79..54a1d10 100644 --- a/flake.lock +++ b/flake.lock @@ -201,11 +201,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1727040444, - "narHash": "sha256-19FNN5QT9Z11ZUMfftRplyNN+2PgcHKb3oq8KMW/hDA=", + "lastModified": 1727665282, + "narHash": "sha256-oKtfbQB1MBypqIyzkC8QCQcVGOa1soaXaGgcBIoh14o=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d0cb432a9d28218df11cbd77d984a2a46caeb5ac", + "rev": "11c43c830e533dad1be527ecce379fcf994fbbb5", "type": "github" }, "original": { @@ -245,11 +245,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1727320268, - "narHash": "sha256-B4AK91+9frHerQ6mFAtaR46ECMRtZufrtXFj/b5NqYU=", + "lastModified": 1727836449, + "narHash": "sha256-+t0jCdN1AFWLpi+XwHK4r/Jp+pJfo9ePHIy+4/BUCI4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ea2838e1ce0a9da2abf88275843aca29d9f82b30", + "rev": "35d02934a17a4fdc53a8857826ed35f3694e5f1c", "type": "github" }, "original": { @@ -349,11 +349,11 @@ }, "personal-secret": { "locked": { - "lastModified": 1727268086, - "narHash": "sha256-WcZ5Aa2XKLNHz4ly83CRrmFuWBo6Fg+kMGrERudvTUY=", + "lastModified": 1727854012, + "narHash": "sha256-12HU12uX1UOrJPflagk1aM5r6w2Nh6fCKJugnSqpRkY=", "ref": "refs/heads/master", - "rev": "dfdcf00c0dae3694a256b0a1d78e1348636a7589", - "revCount": 113, + "rev": "2215dc87e4d5d7562fbb7953d041c5e7d046a811", + "revCount": 117, "type": "git", "url": "ssh://git@cynerd.cz/nixos-personal-secret" }, @@ -561,11 +561,11 @@ }, "vpsadminos": { "locked": { - "lastModified": 1727306253, - "narHash": "sha256-PdVXdZvhAqQFALZiACXIjwFRSo0EhEKMm94uxvyFyPk=", + "lastModified": 1727785026, + "narHash": "sha256-pEslwS/jAkI+XeUrdMQHfeXG/mou7srqvlLsSajbKGg=", "owner": "vpsfreecz", "repo": "vpsadminos", - "rev": "bd2b87cbcb75a9e9aa25f76fb7e1f0f625963277", + "rev": "2a52f384d4c16a6e2badd80c7f5c826b609ee416", "type": "github" }, "original": { diff --git a/nixos/configurations/adm-omnia.nix b/nixos/configurations/adm-omnia.nix index 069dfb0..056a68e 100644 --- a/nixos/configurations/adm-omnia.nix +++ b/nixos/configurations/adm-omnia.nix @@ -26,12 +26,12 @@ in { enable = false; ar9287 = { interface = "wlp1s0"; - bssids = ["04:f0:21:23:3d:ce" "08:f0:21:23:3d:ce" "0c:f0:21:23:3d:ce"]; + bssids = config.secrets.wifiMacs.adm-omnia.ar9287; channel = 11; }; qca988x = { interface = "wlp3s0"; - bssids = ["04:f0:21:24:0b:4e" "08:f0:21:24:0b:4e" "0c:f0:21:24:0b:4e"]; + bssids = config.secrets.wifiMacs.adm-omnia.qca988x; channel = 36; }; }; diff --git a/nixos/configurations/adm-omnia2.nix b/nixos/configurations/adm-omnia2.nix index 45b8dc4..8b47e63 100644 --- a/nixos/configurations/adm-omnia2.nix +++ b/nixos/configurations/adm-omnia2.nix @@ -15,12 +15,12 @@ enable = true; ar9287 = { interface = "wlp2s0"; - bssids = ["12:f0:21:23:2b:00" "12:f0:21:23:2b:01" "12:f0:21:23:2b:02"]; + bssids = config.secrets.wifiMacs.adm-omnia2.ar9287; channel = 11; }; qca988x = { interface = "wlp1s0"; - bssids = ["12:f0:21:23:2b:03" "12:f0:21:23:2b:04" "12:f0:21:23:2b:05"]; + bssids = config.secrets.wifiMacs.adm-omnia2.qca988x; channel = 36; }; }; diff --git a/nixos/configurations/spt-mox.nix b/nixos/configurations/spt-mox.nix index 0bc7627..989df29 100644 --- a/nixos/configurations/spt-mox.nix +++ b/nixos/configurations/spt-mox.nix @@ -17,7 +17,7 @@ enable = true; qca988x = { interface = "wlp1s0"; - bssids = ["04:f0:21:24:24:d2" "08:f0:21:24:24:d2"]; + bssids = config.secrets.wifiMacs.spt-mox.qca988x; channel = 7; }; }; diff --git a/nixos/configurations/spt-mox2.nix b/nixos/configurations/spt-mox2.nix index af0796c..b416671 100644 --- a/nixos/configurations/spt-mox2.nix +++ b/nixos/configurations/spt-mox2.nix @@ -20,7 +20,7 @@ enable = true; qca988x = { interface = "wlp1s0"; - bssids = ["04:f0:21:45:d3:47" "08:f0:21:45:d3:47"]; + bssids = config.secrets.wifiMacs.spt-mox2.qca988x; channel = 1; }; }; diff --git a/nixos/configurations/spt-omnia.nix b/nixos/configurations/spt-omnia.nix index 5a8c75a..e55e34f 100644 --- a/nixos/configurations/spt-omnia.nix +++ b/nixos/configurations/spt-omnia.nix @@ -24,12 +24,12 @@ in { enable = true; ar9287 = { interface = "wlp1s0"; - bssids = ["04:f0:21:24:21:93" "08:f0:21:24:21:93"]; + bssids = config.secrets.wifiMacs.spt-omnia.ar9287; channel = 11; }; qca988x = { interface = "wlp3s0"; - bssids = ["04:f0:21:23:16:64" "08:f0:21:23:16:64"]; + bssids = config.secrets.wifiMacs.spt-omnia.qca988x; channel = 36; }; }; -- cgit v1.2.3