From ae278d745dd8eca94374b27c1fa9a977e54c23c2 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Sat, 12 Mar 2022 18:40:38 +0100
Subject: vidhar: netboot installer

---
 hosts/sif/default.nix | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

(limited to 'hosts/sif')

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 24cc86ac..647021ca 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -14,6 +14,7 @@ in {
     ./hw.nix
     ./mail
     initrd-all-crypto-modules default-locale openssh rebuild-machines
+    networkmanager
   ];
 
   config = {
@@ -71,16 +72,6 @@ in {
                           ];
       };
 
-      networkmanager = {
-        enable = true;
-        dhcp = "internal";
-        dns = lib.mkForce "dnsmasq";
-        extraConfig = ''
-          [connectivity]
-          uri=https://online.yggdrasil.li
-        '';
-      };
-
       # wlanInterfaces = {
       #   wlan0 = {
       #     device = "wlp82s0";
@@ -98,7 +89,6 @@ in {
       #   };
       # };
 
-      dhcpcd.enable = false;
       useDHCP = false;
       useNetworkd = true;
 
@@ -109,9 +99,6 @@ in {
       # };
     };
 
-    systemd.services."NetworkManager-wait-online".enable = false;
-    systemd.services."systemd-networkd-wait-online".enable = false;
-
     environment.etc."NetworkManager/dnsmasq.d/libvirtd_dnsmasq.conf" = {
       text = ''
         server=/sif.libvirt/192.168.122.1
@@ -205,8 +192,6 @@ in {
     };
     networking.networkmanager.unmanaged = ["wgrz"];
 
-    services.resolved.enable = false;
-
     services.openssh.enable = true;
 
     powerManagement = {
-- 
cgit v1.2.3