Compare commits

...

5 commits

Author SHA1 Message Date
4a06b455b9
feat(networking): add wifi-auto-toggle dispatcher script
All checks were successful
Test / tests (push) Successful in 10m0s
2025-08-27 16:17:17 +02:00
587134e555
fix(networking): fixes for connect-ice script
- fix regular expression in connect-ice script
- replaces `writeText` with `writeShellScript`
2025-08-27 16:12:52 +02:00
bc10f5b309
feat(home): switch from authenticator to proton-authenticator 2025-08-27 14:28:38 +02:00
f9682b0aaf
chore(flake): update inputs 2025-08-27 14:27:50 +02:00
5cccb80fa9
build(forgejo): remove build for removed package brlaser 2025-08-27 14:27:16 +02:00
5 changed files with 58 additions and 40 deletions

View file

@ -17,7 +17,6 @@ jobs:
# authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" # authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}"
- run: nix flake check - run: nix flake check
continue-on-error: true continue-on-error: true
- run: nix build .#brlaser
- run: nix build .#deconz - run: nix build .#deconz
- run: nix build .#nixosConfigurations.home-server.config.system.build.toplevel - run: nix build .#nixosConfigurations.home-server.config.system.build.toplevel
# - run: nix build .#nixosConfigurations.home-pc.config.system.build.toplevel # - run: nix build .#nixosConfigurations.home-pc.config.system.build.toplevel

66
flake.lock generated
View file

@ -10,11 +10,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1750173260, "lastModified": 1754433428,
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -26,11 +26,11 @@
"arkenfox-userjs": { "arkenfox-userjs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1745247844, "lastModified": 1755109759,
"narHash": "sha256-YfgmhyqLH067pjqRSeCpfqFkeaac1nBvsKcrRNkKw7o=", "narHash": "sha256-+DN5bKev9IyefMikOqEWZf/u0flJbLAxwEotGhKSSS4=",
"owner": "arkenfox", "owner": "arkenfox",
"repo": "user.js", "repo": "user.js",
"rev": "7f852e94fc80fd0aa19f1c948319974e3301187f", "rev": "9103afafff2b5287b495c1a1268968fdb447d66f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -129,11 +129,11 @@
}, },
"locked": { "locked": {
"dir": "pkgs/firefox-addons", "dir": "pkgs/firefox-addons",
"lastModified": 1753070653, "lastModified": 1756267413,
"narHash": "sha256-vp4Svdpb90eEYkUKxjVROgcJ92u/2sVF8hnpsiKJEhI=", "narHash": "sha256-6U8w5ekYCkSl+abrWoZbMRIJh38pjO2zCQsLxhh9ea4=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "87f5912350a5bac28eacc1b89bb1767ca1a77e7e", "rev": "cfca2aacacfd57476bd4137033e1b181ed239dff",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -178,11 +178,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1747046372,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751413152, "lastModified": 1754487366,
"narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=", "narHash": "sha256-pHYj8gUBapuUzKV/kN/tR3Zvqc7o6gdFB9XKXIp1SQ8=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "77826244401ea9de6e3bac47c2db46005e1f30b5", "rev": "af66ad14b28a127c5c0f3bbb298218fc63528a18",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -314,11 +314,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1753055804, "lastModified": 1756245065,
"narHash": "sha256-KerePGJYX47ex6OY3CWsid4AltO2gDtQROunYJ0eCEE=", "narHash": "sha256-aAZNbGcWrVRZgWgkQbkabSGcDVRDMgON4BipMy69gvI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "adf195f021a8cbb0c317f75b52e96c82616526f9", "rev": "54b2879ce622d44415e727905925e21b8f833a98",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -405,11 +405,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1752666637, "lastModified": 1756245047,
"narHash": "sha256-P8J72psdc/rWliIvp8jUpoQ6qRDlVzgSDDlgkaXQ0Fw=", "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "d1bfa8f6ccfb5c383e1eba609c1eb67ca24ed153", "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -420,11 +420,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1752866191, "lastModified": 1756217674,
"narHash": "sha256-NV4S2Lf2hYmZQ3Qf4t/YyyBaJNuxLPyjzvDma0zPp/M=", "narHash": "sha256-TH1SfSP523QI7kcPiNtMAEuwZR3Jdz0MCDXPs7TS8uo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f01fe91b0108a7aff99c99f2e9abbc45db0adc2a", "rev": "4e7667a90c167f7a81d906e5a75cba4ad8bee620",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,11 +436,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1752950548, "lastModified": 1756125398,
"narHash": "sha256-NS6BLD0lxOrnCiEOcvQCDVPXafX1/ek1dfJHX1nUIzc=", "narHash": "sha256-XexyKZpf46cMiO5Vbj+dWSAXOnr285GHsMch8FBoHbc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c87b95e25065c028d31a94f06a62927d18763fdf", "rev": "3b9f00d7a7bf68acd4c4abb9d43695afb04e03a5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -475,11 +475,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1753086528, "lastModified": 1756283140,
"narHash": "sha256-5RMRU6J7fiaHzA0Bz/xStfuLLQ1AtJfIagxHqEhAb2c=", "narHash": "sha256-8AuMP13UaN30a/9bT4JzpCRqmjh0VxfPAK073RJv4UM=",
"owner": "astro", "owner": "astro",
"repo": "nix-openwrt-imagebuilder", "repo": "nix-openwrt-imagebuilder",
"rev": "09b9e58d8b4e98193590aa02f60b41881fad840d", "rev": "7fd8eb5de4235f44a8071ffd3daf877a9f2c4de6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -497,11 +497,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750779888, "lastModified": 1755960406,
"narHash": "sha256-wibppH3g/E2lxU43ZQHC5yA/7kIKLGxVEnsnVK1BtRg=", "narHash": "sha256-RF7j6C1TmSTK9tYWO6CdEMtg6XZaUKcvZwOCD2SICZs=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "16ec914f6fb6f599ce988427d9d94efddf25fe6d", "rev": "e891a93b193fcaf2fc8012d890dc7f0befe86ec2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -56,7 +56,7 @@ with pkgs;
# security & privacy # security & privacy
unstable.proton-pass unstable.proton-pass
authenticator unstable.proton-authenticator
collision collision
metadata-cleaner metadata-cleaner
raider raider

View file

@ -69,7 +69,7 @@
# security & privacy # security & privacy
unstable.proton-pass unstable.proton-pass
authenticator unstable.proton-authenticator
collision collision
metadata-cleaner metadata-cleaner
raider raider

View file

@ -122,12 +122,31 @@ in
networking.networkmanager.dispatcherScripts = [ networking.networkmanager.dispatcherScripts = [
{ {
#!/usr/bin/env bash source = pkgs.writeShellScript "wifi-auto-toggle" ''
source = pkgs.writeText "connect_ice" '' LOG_PREFIX="WiFi Auto-Toggle"
set -euxo pipefail
if [[ "$1" =~ ^(enp|eth) ]]; then
case "$2" in
up)
echo "$LOG_PREFIX ethernet up"
${pkgs.networkmanager}/bin/nmcli radio wifi off
;;
down)
echo "$LOG_PREFIX ethernet down"
${pkgs.networkmanager}/bin/nmcli radio wifi on
;;
esac
elif [[ "$(${pkgs.networkmanager}/bin/nmcli -g GENERAL.STATE device show $ETHERNET_INTERFACE)" = "20 (unavailable)" ]]; then
echo "$LOG_PREFIX failsafe"
${pkgs.networkmanager}/bin/nmcli radio wifi on
fi
'';
}
{
source = pkgs.writeShellScript "connect-ice" ''
ACTION="$2" ACTION="$2"
if [[ "$ACTION" == "up" ]]; then if [[ "$ACTION" == "up" ]]; then
if [[ "$CONNECTION_ID" =~ "WIFIonICE|WIFI@DB" ]]; then if [[ "$CONNECTION_ID" =~ ^(WIFIonICE|WIFI\@DB)$ ]]; then
${pkgs.curl}/bin/curl 'https://login.wifionice.de/cna/logon' -sSL -X POST ${pkgs.curl}/bin/curl 'https://login.wifionice.de/cna/logon' -sSL -X POST
fi fi
fi fi