From a7894c6f6a9d63a2b0804747c5ace515fdb666ba Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 22 Jan 2026 15:36:05 +0800 Subject: [PATCH 1/2] chore: Update pkgs upstream sources --- _sources/generated.json | 40 +++++++++------------------------------- _sources/generated.nix | 31 ++++++++----------------------- nvfetcher.toml | 5 ----- pkgs/helix/package.nix | 2 +- 4 files changed, 18 insertions(+), 60 deletions(-) diff --git a/_sources/generated.json b/_sources/generated.json index bf648ec..9758210 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2026-01-14", + "date": "2026-01-23", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "aa13bda89bcd7deb9be26dc11a4cfb49543274b0", - "sha256": "sha256-HWami8LfjIawAJkSAAYgK+ifz9h4HZx8AvOTl4K5HC8=", + "rev": "61e90fe4cbf20204a0b5590df7c6d48556512185", + "sha256": "sha256-vJfyx/rjlLf8mJnV8Trx+hppCRyu1BfBmCOvA6YjjZc=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "aa13bda89bcd7deb9be26dc11a4cfb49543274b0" + "version": "61e90fe4cbf20204a0b5590df7c6d48556512185" }, "noto-sans-cjk": { "cargoLocks": null, @@ -127,7 +127,7 @@ }, "spotx": { "cargoLocks": null, - "date": "2026-01-10", + "date": "2026-01-14", "extract": null, "name": "spotx", "passthru": null, @@ -139,34 +139,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b", - "sha256": "sha256-SyrdV5RENFEYQZcd7MTtegvPcuGKzTmWQiwPcbnoWpY=", + "rev": "37ffdc78ba3ded6af6550895bfc687f44f1c4af6", + "sha256": "sha256-W6TGdLFPMcfaYG55fKu3ieKROBArFTg9KwW8VRBFcnI=", "sparseCheckout": [], "type": "github" }, - "version": "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b" - }, - "tree-sitter-idris": { - "cargoLocks": null, - "date": "2024-11-05", - "extract": null, - "name": "tree-sitter-idris", - "passthru": { - "name": "idris" - }, - "pinned": false, - "src": { - "deepClone": false, - "fetchSubmodules": false, - "leaveDotGit": false, - "name": null, - "rev": "c56a25cf57c68ff929356db25505c1cc4c7820f6", - "sha256": "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk=", - "sparseCheckout": [], - "type": "git", - "url": "https://github.com/kayhide/tree-sitter-idris" - }, - "version": "c56a25cf57c68ff929356db25505c1cc4c7820f6" + "version": "37ffdc78ba3ded6af6550895bfc687f44f1c4af6" }, "wshowkeys-mao": { "cargoLocks": null, @@ -189,4 +167,4 @@ }, "version": "184f55dbc5320c34a56d02353410ad35a0f3e090" } -} +} \ No newline at end of file diff --git a/_sources/generated.nix b/_sources/generated.nix index b7d081a..7fb9cf4 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "aa13bda89bcd7deb9be26dc11a4cfb49543274b0"; + version = "61e90fe4cbf20204a0b5590df7c6d48556512185"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "aa13bda89bcd7deb9be26dc11a4cfb49543274b0"; + rev = "61e90fe4cbf20204a0b5590df7c6d48556512185"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-HWami8LfjIawAJkSAAYgK+ifz9h4HZx8AvOTl4K5HC8="; + sha256 = "sha256-vJfyx/rjlLf8mJnV8Trx+hppCRyu1BfBmCOvA6YjjZc="; }; - date = "2026-01-14"; + date = "2026-01-23"; }; noto-sans-cjk = { pname = "noto-sans-cjk"; @@ -79,30 +79,15 @@ }; spotx = { pname = "spotx"; - version = "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b"; + version = "37ffdc78ba3ded6af6550895bfc687f44f1c4af6"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b"; + rev = "37ffdc78ba3ded6af6550895bfc687f44f1c4af6"; fetchSubmodules = false; - sha256 = "sha256-SyrdV5RENFEYQZcd7MTtegvPcuGKzTmWQiwPcbnoWpY="; + sha256 = "sha256-W6TGdLFPMcfaYG55fKu3ieKROBArFTg9KwW8VRBFcnI="; }; - date = "2026-01-10"; - }; - tree-sitter-idris = { - pname = "tree-sitter-idris"; - version = "c56a25cf57c68ff929356db25505c1cc4c7820f6"; - src = fetchgit { - url = "https://github.com/kayhide/tree-sitter-idris"; - rev = "c56a25cf57c68ff929356db25505c1cc4c7820f6"; - fetchSubmodules = false; - deepClone = false; - leaveDotGit = false; - sparseCheckout = [ ]; - sha256 = "sha256-aOAxb0KjhSwlNX/IDvGwEysYvImgUEIDeNDOWRl1qNk="; - }; - name = "idris"; - date = "2024-11-05"; + date = "2026-01-14"; }; wshowkeys-mao = { pname = "wshowkeys-mao"; diff --git a/nvfetcher.toml b/nvfetcher.toml index 4c6996a..0ce53ff 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -1,8 +1,3 @@ -[tree-sitter-idris] -fetch.git = "https://github.com/kayhide/tree-sitter-idris" -passthru.name = "idris" -src.git = "https://github.com/kayhide/tree-sitter-idris" - [noto-serif-cjk] fetch.github = "notofonts/noto-cjk" git.sparseCheckout = ["Serif/OTC"] diff --git a/pkgs/helix/package.nix b/pkgs/helix/package.nix index fd1be2f..c876272 100644 --- a/pkgs/helix/package.nix +++ b/pkgs/helix/package.nix @@ -29,7 +29,7 @@ in // { languages = lib.pipe "${helix.src}/languages.toml" [ builtins.readFile - builtins.fromTOML + fromTOML ]; }; } From cec21244b33fc76aa28dbd6bddc468c12f01ccb9 Mon Sep 17 00:00:00 2001 From: ulic-youthlic Date: Thu, 22 Jan 2026 15:36:05 +0800 Subject: [PATCH 2/2] feat: Use wireless device as software AP for Tytonidae --- nixos/configurations/Tytonidae/networking.nix | 27 ++++++++++++++++--- nixos/modules/programs/dae/config.dae | 4 +-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/nixos/configurations/Tytonidae/networking.nix b/nixos/configurations/Tytonidae/networking.nix index 673c472..e8404f3 100644 --- a/nixos/configurations/Tytonidae/networking.nix +++ b/nixos/configurations/Tytonidae/networking.nix @@ -39,8 +39,11 @@ # Bond = "bond0"; # PrimarySlave = true; - DHCP = "ipv4"; + DHCP = "yes"; IPv6AcceptRA = true; + + IPMasquerade = "yes"; + IPv4Forwarding = "yes"; }; linkConfig = { RequiredForOnline = "routable"; @@ -49,6 +52,24 @@ Name = "eno2"; }; }; + "20-wlan0" = { + matchConfig = { + Name = "wlan0"; + }; + + address = ["192.168.110.1/24"]; + networkConfig = { + DHCPServer = "yes"; + IPMasquerade = "yes"; + IPv4Forwarding = "yes"; + }; + dhcpServerConfig = { + PoolOffset = 100; + PoolSize = 20; + EmitDNS = "yes"; + DNS = "8.8.8.8"; + }; + }; # "20-wlan0" = { # networkConfig = { # # Bond = "bond0"; @@ -87,8 +108,8 @@ Enabled = true; }; General = { - # EnableNetworkConfiguration = false; - EnableNetworkConfiguration = true; + EnableNetworkConfiguration = false; + # EnableNetworkConfiguration = true; }; Settings = { AutoConnect = true; diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index 6aa935c..5cbb748 100644 --- a/nixos/modules/programs/dae/config.dae +++ b/nixos/modules/programs/dae/config.dae @@ -4,8 +4,8 @@ include { } global { - lan_interface: auto - wan_interface: auto + lan_interface: wlan0,eno2 + wan_interface: eno2 log_level: trace allow_insecure: false