home-manager: update

[julm/julm-nix.git] / nixos / profiles / networking.nix

diff --git a/nixos/profiles/networking.nix b/nixos/profiles/networking.nix
index 7e0b9048aa40fe4f16e45b7c2e0989ec51f0c7a2..9a3d7c98128d5b8bcba21f316de99625fad98997 100644 (file)
--- a/nixos/profiles/networking.nix
+++ b/nixos/profiles/networking.nix
@@ -1,4 +1,10 @@
-{ config, pkgs, lib, hostName, ... }:
+{
+  config,
+  pkgs,
+  lib,
+  hostName,
+  ...
+}:
 with lib;
 {
   imports = [
@@ -45,14 +51,13 @@ with lib;
 
   networking = {
     inherit hostName;
-    domain = mkDefault "wg";
+    domain = mkDefault "sp";
     #search = [ "sourcephile.fr" ];
     firewall = {
       enable = mkDefault true;
       allowPing = mkDefault true;
     };
     networkmanager = {
-      enable = mkDefault config.services.xserver.enable;
       #dhcp = "dhcpcd";
       logLevel = mkDefault "INFO";
       wifi = {
@@ -68,32 +73,16 @@ with lib;
   programs.traceroute.enable = mkDefault true;
   programs.usbtop.enable = true;
 
-  services.avahi = {
-    nssmdns = mkDefault true;
-    openFirewall = mkDefault false;
-    publish.enable = mkDefault false;
-  };
-  networking.nftables.ruleset = mkIf config.services.avahi.enable (''
-    table inet filter {
-      chain output-lan {
-        skuid root udp sport mdns udp dport mdns comment "avahi: multicast DNS"
-      }
-    }
-  '' + optionalString config.services.avahi.openFirewall ''
-    table inet filter {
-      chain input-lan {
-        udp dport mdns comment "avahi: multicast DNS"
-      }
-    }
-  '');
-
   services.openssh.enable = mkDefault true;
 
   # Fix https://github.com/NixOS/nixpkgs/issues/180175 by removing -s (aka. --wait-for-startup)
-  systemd.services.NetworkManager-wait-online = {
+  systemd.services.NetworkManager-wait-online = lib.mkIf config.networking.networkmanager.enable {
     unitConfig.StartLimitIntervalSec = 0;
     serviceConfig = {
-      ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
+      ExecStart = [
+        ""
+        "${pkgs.networkmanager}/bin/nm-online -q"
+      ];
       Restart = "on-failure";
       RestartSec = 1;
     };