Compare commits

..

4 commits

Author SHA1 Message Date
d74a807122
packages/ruler: update 2025-12-04 01:10:10 +08:00
88af6454b7
networks: update wpa_supplicant-compat shim 2025-12-03 23:59:47 +08:00
42b32be4a5
npins: update zen-browser 2025-12-03 23:09:43 +08:00
54f685e90c
networks: update 2025-12-02 14:37:05 +08:00
5 changed files with 14 additions and 10 deletions

View file

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

View file

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

View file

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

Binary file not shown.

View file

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