Skip to content

Commit 3e19bc5

Browse files
committed
Migrate to newer options and packages
1 parent df44569 commit 3e19bc5

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

dns.nix

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@ in
5050
config = lib.mkIf cfg.enable {
5151
services.resolved = {
5252
enable = true;
53-
fallbackDns = [ ];
54-
extraConfig = ''
55-
DNS=[::1]:53
56-
DNSStubListener=no
57-
'';
53+
settings.Resolve = {
54+
DNS = [ "[::1]:53" ];
55+
DNSStubListener = false;
56+
FallbackDNS = lib.mkForce [ ];
57+
};
5858
};
5959

6060
services.knot-resolver = {

flake.lock

Lines changed: 11 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
lib = pkgs.callPackage ./lib-tests.nix { };
2222
});
2323
nixosModules.default = ./module.nix;
24-
formatter = forAllSystems (pkgs: pkgs.nixfmt-rfc-style);
24+
formatter = forAllSystems (pkgs: pkgs.nixfmt);
2525
devShells = forAllSystems (pkgs: {
2626
default = pkgs.mkShell {
2727
packages = with pkgs; [
@@ -34,7 +34,7 @@
3434
(inputs.git-hooks.lib.${pkgs.stdenv.hostPlatform.system}.run {
3535
src = ./.;
3636
hooks.deadnix.enable = true;
37-
hooks.nixfmt-rfc-style.enable = true;
37+
hooks.nixfmt.enable = true;
3838
})
3939
shellHook
4040
;

test.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ testers.nixosTest {
1818
virtualisation.vlans = [ 1 ];
1919

2020
# don't use defaults that require internet connectivity
21-
services.resolved.fallbackDns = [ ];
21+
services.resolved.settings.Resolve.FallbackDns = lib.mkForce [ ];
2222

2323
networking = {
2424
useNetworkd = true;

0 commit comments

Comments
 (0)