diff --git a/nix/networks/list.nix b/nix/networks/list.nix index 4ec25b95..75127935 100644 --- a/nix/networks/list.nix +++ b/nix/networks/list.nix @@ -14,11 +14,6 @@ in priority = privatePriority; hasPassword = true; } - { - ssid ="Kuo"; - priority = privatePriority; - hasPassword = true; - } { ssid = "girlypop-net"; priority = privatePriority; diff --git a/nix/networks/wpa_supplicant-compat.nix b/nix/networks/wpa_supplicant-compat.nix index 65f130a0..a4db89a7 100644 --- a/nix/networks/wpa_supplicant-compat.nix +++ b/nix/networks/wpa_supplicant-compat.nix @@ -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 {}).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}\""} ''; } ]; diff --git a/nix/packages/by-name/ruler/package.nix b/nix/packages/by-name/ruler/package.nix index 3c36cef9..e873a2b6 100644 --- a/nix/packages/by-name/ruler/package.nix +++ b/nix/packages/by-name/ruler/package.nix @@ -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: { diff --git a/nix/secrets/wpa_password.age b/nix/secrets/wpa_password.age index 17fe933a..47b97605 100644 Binary files a/nix/secrets/wpa_password.age and b/nix/secrets/wpa_password.age differ diff --git a/npins/sources.json b/npins/sources.json index faf7de90..cee4d919 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -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