Compare commits

..

No commits in common. "d74a8071223f744cf7ab54287b201353950c0831" and "70e063d8df909309609af37844207a49f5110770" have entirely different histories.

5 changed files with 10 additions and 14 deletions

View file

@ -14,11 +14,6 @@ in
priority = privatePriority;
hasPassword = true;
}
{
ssid ="Kuo";
priority = privatePriority;
hasPassword = true;
}
{
ssid = "girlypop-net";
priority = privatePriority;

View file

@ -1,8 +1,6 @@
#
# This loads the list of networks as a NixOS wpa_supplicant compatible attrset
#
# View the example config
# less $(nix-build --no-out-link -E '(import <nixpkgs> {}).wpa_supplicant')/share/doc/wpa_supplicant/wpa_supplicant.conf.example
let
sources = import ../../npins;
lib = import (sources.nixpkgs + "/lib");
@ -17,16 +15,18 @@ let
hasPassword ? false,
scanOnLowSignal ? false,
randomizeMac ? false,
# TODO: adapt to the 25.11 interface
bssid ? null,
...
}:
{
${ssid} = lib.mkMerge [
(builtins.removeAttrs networkArgs [
# We keep ssid, because it overrides the attrset name ssid
# "ssid"
"ssid"
"hasPassword"
"scanOnLowSignal"
"randomizeMac"
"bssid"
])
(lib.optionalAttrs hasPassword {
pskRaw = "ext:${escapePwdKey ssid}";
@ -35,6 +35,7 @@ let
extraConfig = ''
${lib.optionalString scanOnLowSignal "bgscan=\"simple:30:-70:3600\""}
${lib.optionalString randomizeMac "mac_addr=1"}
${lib.optionalString (bssid != null) "bssid=\"${bssid}\""}
'';
}
];

View file

@ -11,8 +11,8 @@ let
domain = "git.confusedcompiler.org";
owner = "leana8959";
repo = "ruler";
rev = "89e63d4055cbeca840b6ecaab12683b19e8e2fdd";
hash = "sha256-KPbb1JcFNTF5A6ImfGYc1iSxo3K6poCCRGFNqIHwzrM=";
rev = "0b4e3ea1e477d4a817da8730fab7fb22ba25fa61";
hash = "sha256-CoGJ3uOVEd6K+zFeBkZKVYVm5697Qu9aLYzmlfqGej0=";
}) { };
cabalOverrides = o: {

Binary file not shown.

View file

@ -378,9 +378,9 @@
},
"branch": "main",
"submodules": false,
"revision": "df63ce4f706567e6efa083ba63d5e7792bf70ffa",
"url": "https://github.com/0xc000022070/zen-browser-flake/archive/df63ce4f706567e6efa083ba63d5e7792bf70ffa.tar.gz",
"hash": "0aqkcms4a5n4pib06zxm6ljqxssz4lcda73ry76qq7wahpz261q9"
"revision": "fb066e133e614c024a470608ff56585c4f707b44",
"url": "https://github.com/0xc000022070/zen-browser-flake/archive/fb066e133e614c024a470608ff56585c4f707b44.tar.gz",
"hash": "04icaki7ygwrq7h4m4bkh5k08rpdr4qagz0z1mbbk4927ljqn30x"
}
},
"version": 5