diff --git a/nixos/configurations/Tytonidae/networking.nix b/nixos/configurations/Tytonidae/networking.nix index 0d96497..3da415a 100644 --- a/nixos/configurations/Tytonidae/networking.nix +++ b/nixos/configurations/Tytonidae/networking.nix @@ -21,7 +21,7 @@ ]; matchConfig.Name = "eno2"; # networkConfig = { - # DHCP = "no"; + # DHCP = "yes"; # IPv6AcceptRA = true; # }; }; diff --git a/nixos/modules/programs/dae/config.dae b/nixos/modules/programs/dae/config.dae index f77c842..80b9e11 100644 --- a/nixos/modules/programs/dae/config.dae +++ b/nixos/modules/programs/dae/config.dae @@ -12,8 +12,8 @@ global { auto_config_kernel_parameter: true dial_mode: domain - tcp_check_url: 'http://cp.cloudflare.com' - udp_check_dns: 'dns.google.com:53' + # tcp_check_url: 'http://cp.cloudflare.com' + # udp_check_dns: '114.114.114.114:53' check_interval: 600s check_tolerance: 50ms @@ -25,7 +25,7 @@ dns { upstream { googledns: 'tcp+udp://8.8.8.8:53' - alidns: 'udp://dns.alidns.com:53' + alidns: 'udp://223.5.5.5:53' } routing { request { diff --git a/nixos/modules/programs/dae/default.nix b/nixos/modules/programs/dae/default.nix index 08b0b3f..1f369e2 100644 --- a/nixos/modules/programs/dae/default.nix +++ b/nixos/modules/programs/dae/default.nix @@ -18,6 +18,7 @@ in (lib.mkIf cfg.enable { services.dae = { enable = true; + package = pkgs.dae; openFirewall = { enable = true; port = 12345; @@ -63,6 +64,7 @@ in fi done if [[ -d /etc/dae/proxy.d ]]; then + rm -rf /etc/proxy.d.old mv /etc/dae/proxy.d /etc/dae/proxy.d.old fi mv ''${new_proxy} /etc/dae/proxy.d diff --git a/overlays/modifications/dae.nix b/overlays/modifications/dae.nix new file mode 100644 index 0000000..3921d25 --- /dev/null +++ b/overlays/modifications/dae.nix @@ -0,0 +1,9 @@ +{ inputs, ... }: +final: prev: +let + inherit (final) stdenv; + inherit (stdenv.hostPlatform) system; +in +{ + dae = inputs.dae.packages."${system}".dae-unstable; +} diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index 8e73060..fb5af78 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -7,6 +7,7 @@ let ./niri.nix ./ghostty.nix ./juicity.nix + ./dae.nix ]; overlay-list = map (file: import file args) overlay-files; in diff --git a/secrets/general.yaml b/secrets/general.yaml index 3b0c6b7..2bed962 100644 --- a/secrets/general.yaml +++ b/secrets/general.yaml @@ -55,8 +55,8 @@ sops: a1Y1NU9CK2h1SS83VW42bzBMa01yMXMKI1DBtgNlkNCrxUQvnD6a45mQKNfg5gM4 Zb5buo9Jofj4dn/HFwng3T3gxKTrP2Dh74CAH4L0M5yrF9fzk5TCcQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2025-03-04T06:22:13Z" - mac: ENC[AES256_GCM,data:nQ3ZmOL0MOxL3/dEY0TGsI0003O/ZNjqilSojikn0oN2OyR2chYcpbRDKpPtoZwoJ+QfMH+etnxt9lo+tPKr+hF8a4rQeWK4oErZTAemPoGPPsYgf9TLqjjQ7pUQI/wzLX0OaBJSbITNBiC4I1wUtA3NPyRPhGYNA0st7Mz2fP0=,iv:SkYgbhWrlyQAZer5ZeLExwMdOmnxRQ3mwxsdLtA7DYI=,tag:NAPlZ7UYRT0XXRLSigHfWA==,type:str] + lastmodified: "2025-03-05T19:37:15Z" + mac: ENC[AES256_GCM,data:jrQ3yMHnligZLO4+4i2FWOEZQ/Lnv9EwZQ8WLeNup+gTrOtcU6pjD/Pg3V0xp1Xe/HZCB9+8DRUWxAOjaD1lx7PYkktSJY9dhdF93JulP1G7gm1eG1LMVU3KqWXMzyJ1UwoUd1xrF/9Z7z8FK21CSo7RF9s9S5FmT0uP/1xZJU8=,iv:BIwUiKqrBCOJiE4uOg+vqd94lC+YxbCb7SeomddtB5o=,tag:MFexMkHKQmrI112l4O13jg==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.4