youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

use unstable dae for fix bug and modify some dae config

Browse source
This commit is contained in:
ulic-youthlic 2025-03-06 03:37:19 +08:00
parent 7871e788aa
commit 1620d6cd44
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
6 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
nixos/configurations/Tytonidae/networking.nix
View file

@ -21,7 +21,7 @@
]; ];
matchConfig.Name = "eno2"; matchConfig.Name = "eno2";
# networkConfig = { # networkConfig = {
# DHCP = "no"; # DHCP = "yes";
# IPv6AcceptRA = true; # IPv6AcceptRA = true;
# }; # };
}; };

6
nixos/modules/programs/dae/config.dae
View file

@ -12,8 +12,8 @@ global {
auto_config_kernel_parameter: true auto_config_kernel_parameter: true
dial_mode: domain dial_mode: domain
tcp_check_url: 'http://cp.cloudflare.com' # tcp_check_url: 'http://cp.cloudflare.com'
udp_check_dns: 'dns.google.com:53' # udp_check_dns: '114.114.114.114:53'
check_interval: 600s check_interval: 600s
check_tolerance: 50ms check_tolerance: 50ms
@ -25,7 +25,7 @@ dns {
upstream { upstream {
googledns: 'tcp+udp://8.8.8.8:53' googledns: 'tcp+udp://8.8.8.8:53'
alidns: 'udp://dns.alidns.com:53' alidns: 'udp://223.5.5.5:53'
} }
routing { routing {
request { request {

2
nixos/modules/programs/dae/default.nix
View file

@ -18,6 +18,7 @@ in
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
services.dae = { services.dae = {
enable = true; enable = true;
package = pkgs.dae;
openFirewall = { openFirewall = {
enable = true; enable = true;
port = 12345; port = 12345;
@ -63,6 +64,7 @@ in
fi fi
done done
if [[ -d /etc/dae/proxy.d ]]; then if [[ -d /etc/dae/proxy.d ]]; then
rm -rf /etc/proxy.d.old
mv /etc/dae/proxy.d /etc/dae/proxy.d.old mv /etc/dae/proxy.d /etc/dae/proxy.d.old
fi fi
mv ''${new_proxy} /etc/dae/proxy.d mv ''${new_proxy} /etc/dae/proxy.d

9
overlays/modifications/dae.nix Normal file
View file

@ -0,0 +1,9 @@
{ inputs, ... }:
final: prev:
let
inherit (final) stdenv;
inherit (stdenv.hostPlatform) system;
in
{
dae = inputs.dae.packages."${system}".dae-unstable;
}

1
overlays/modifications/default.nix
View file

@ -7,6 +7,7 @@ let
./niri.nix ./niri.nix
./ghostty.nix ./ghostty.nix
./juicity.nix ./juicity.nix
./dae.nix
]; ];
overlay-list = map (file: import file args) overlay-files; overlay-list = map (file: import file args) overlay-files;
in in

4
secrets/general.yaml
View file

@ -55,8 +55,8 @@ sops:
a1Y1NU9CK2h1SS83VW42bzBMa01yMXMKI1DBtgNlkNCrxUQvnD6a45mQKNfg5gM4 a1Y1NU9CK2h1SS83VW42bzBMa01yMXMKI1DBtgNlkNCrxUQvnD6a45mQKNfg5gM4
Zb5buo9Jofj4dn/HFwng3T3gxKTrP2Dh74CAH4L0M5yrF9fzk5TCcQ== Zb5buo9Jofj4dn/HFwng3T3gxKTrP2Dh74CAH4L0M5yrF9fzk5TCcQ==
-----END AGE ENCRYPTED FILE----- -----END AGE ENCRYPTED FILE-----
lastmodified: "2025-03-04T06:22:13Z" lastmodified: "2025-03-05T19:37:15Z"
mac: ENC[AES256_GCM,data:nQ3ZmOL0MOxL3/dEY0TGsI0003O/ZNjqilSojikn0oN2OyR2chYcpbRDKpPtoZwoJ+QfMH+etnxt9lo+tPKr+hF8a4rQeWK4oErZTAemPoGPPsYgf9TLqjjQ7pUQI/wzLX0OaBJSbITNBiC4I1wUtA3NPyRPhGYNA0st7Mz2fP0=,iv:SkYgbhWrlyQAZer5ZeLExwMdOmnxRQ3mwxsdLtA7DYI=,tag:NAPlZ7UYRT0XXRLSigHfWA==,type:str] mac: ENC[AES256_GCM,data:jrQ3yMHnligZLO4+4i2FWOEZQ/Lnv9EwZQ8WLeNup+gTrOtcU6pjD/Pg3V0xp1Xe/HZCB9+8DRUWxAOjaD1lx7PYkktSJY9dhdF93JulP1G7gm1eG1LMVU3KqWXMzyJ1UwoUd1xrF/9Z7z8FK21CSo7RF9s9S5FmT0uP/1xZJU8=,iv:BIwUiKqrBCOJiE4uOg+vqd94lC+YxbCb7SeomddtB5o=,tag:MFexMkHKQmrI112l4O13jg==,type:str]
pgp: [] pgp: []
unencrypted_suffix: _unencrypted unencrypted_suffix: _unencrypted
version: 3.9.4 version: 3.9.4