nyancat/flake
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

modules: cleanup myFlake.{nixos,darwin}.networking.dns

Browse source
This commit is contained in:
Guanran Wang 2023-11-19 13:33:31 +08:00
parent 5fe1d802b8
commit 6763cdbedc
Signed by: nyancat
SSH key fingerprint: SHA256:8oWGKciPALWut/6WA27oFKofX+6Wtc0gQnsefXLQx/8
4 changed files with 62 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
darwin/modules/networking/dns.nix
View file

@ -2,23 +2,30 @@
lib,
config,
...
}: {
options.myFlake.darwin.networking.dns = lib.mkOption {
}: let
cfg = config.myFlake.darwin.networking.dns;
in {
options = {
myFlake.darwin.networking.dns = {
provider = lib.mkOption {
type = lib.types.enum ["google" "alidns"];
default = "google";
example = "alidns";
description = "Select your DNS provider";
description = "Select desired DNS provider.";
};
};
};
config.networking.dns = lib.mkMerge [
(lib.mkIf (config.myFlake.darwin.networking.dns == "google") [
config = {
networking.dns = lib.mkMerge [
(lib.mkIf (cfg.provider == "google") [
### Google DNS
"8.8.8.8"
"8.8.4.4"
"2001:4860:4860::8888"
"2001:4860:4860::8844"
])
(lib.mkIf (config.myFlake.darwin.networking.dns == "alidns") [
(lib.mkIf (cfg.provider == "alidns") [
### AliDNS
"223.5.5.5"
"223.6.6.6"
@ -26,4 +33,5 @@
"2400:3200:baba::1"
])
];
};
}

18
nixos/modules/networking/dns.nix
View file

@ -2,23 +2,30 @@
lib,
config,
...
}: {
options.myFlake.nixos.networking.dns = lib.mkOption {
}: let
cfg = config.myFlake.nixos.networking.dns;
in {
options = {
myFlake.nixos.networking.dns = {
provider = lib.mkOption {
type = lib.types.enum ["google" "alidns"];
default = "google";
example = "alidns";
description = "Select desired DNS provider.";
};
};
};
config.networking.nameservers = lib.mkMerge [
(lib.mkIf (config.myFlake.nixos.networking.dns == "google") [
config = {
networking.nameservers = lib.mkMerge [
(lib.mkIf (cfg.provider == "google") [
### Google DNS
"8.8.8.8"
"8.8.4.4"
"2001:4860:4860::8888"
"2001:4860:4860::8844"
])
(lib.mkIf (config.myFlake.nixos.networking.dns == "alidns") [
(lib.mkIf (cfg.provider == "alidns") [
### AliDNS
"223.5.5.5"
"223.6.6.6"
@ -26,4 +33,5 @@
"2400:3200:baba::1"
])
];
};
}

2
users/guanranwang/darwin/profiles/core/default.nix
View file

@ -15,7 +15,7 @@
};
### Options
myFlake.darwin.networking.dns = lib.mkDefault "alidns";
myFlake.darwin.networking.dns.provider = lib.mkDefault "alidns";
time.timeZone = lib.mkDefault "Asia/Shanghai";
### Flakes

2
users/guanranwang/nixos/profiles/core/default.nix
View file

@ -24,7 +24,7 @@
programs.fish.enable = true;
### Options
myFlake.nixos.networking.dns = lib.mkDefault "alidns";
myFlake.nixos.networking.dns.provider = lib.mkDefault "alidns";
time.timeZone = lib.mkDefault "Asia/Shanghai";
### Flakes