aboutsummaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2022-10-16 19:36:15 +0200
committerAlex Auvolat <alex@adnab.me>2022-10-16 19:36:15 +0200
commit7866a92e16c30a694d563026e15cb44346312405 (patch)
tree4dfaff64c8bfe2b61ab7d9bd3979bfee2e78d94f /nix
parent27214332e90d2ca3ce3c2097c2aa86c5e2971cdc (diff)
downloadnixcfg-7866a92e16c30a694d563026e15cb44346312405.tar.gz
nixcfg-7866a92e16c30a694d563026e15cb44346312405.zip
remove systemd-resolved
Diffstat (limited to 'nix')
-rw-r--r--nix/configuration.nix2
-rw-r--r--nix/deuxfleurs.nix10
2 files changed, 2 insertions, 10 deletions
diff --git a/nix/configuration.nix b/nix/configuration.nix
index 2bb56f2..aa979db 100644
--- a/nix/configuration.nix
+++ b/nix/configuration.nix
@@ -66,8 +66,6 @@ SystemMaxUse=1G
rclone
docker-compose
wireguard-tools
- #qemu
- #qemu_kvm
];
programs.vim.defaultEditor = true;
diff --git a/nix/deuxfleurs.nix b/nix/deuxfleurs.nix
index 66c153c..e5925fd 100644
--- a/nix/deuxfleurs.nix
+++ b/nix/deuxfleurs.nix
@@ -200,13 +200,14 @@ in
}
];
};
- resolveLocalQueries = false; # don't overwrite our resolv.conf
+ resolveLocalQueries = true;
};
# Reach Unbound through the IP of our LAN interface,
# instead of 127.0.0.1 (this will also work in Docker containers)
networking.nameservers = [
cfg.lan_ip
];
+ services.resolved.enable = false;
# Configure Wireguard VPN between all nodes
networking.wireguard.interfaces.wg0 = {
@@ -272,8 +273,6 @@ in
services.nomad.extraPackages = [
pkgs.glibc
pkgs.zstd
- #pkgs.qemu
- #pkgs.qemu_kvm
];
services.nomad.settings =
(if cfg.is_raft_server
@@ -331,11 +330,6 @@ in
];
}
];
- #qemu = [
- # {
- # enabled = true;
- # }
- #];
}
];
};