From 31852caec4aeb9820968343c18ed8b525f16b18b Mon Sep 17 00:00:00 2001
From: Felix Stupp <felix.stupp@banananet.work>
Date: Fri, 23 Aug 2024 14:34:29 +0000
Subject: [PATCH] nixosMod/improvedDefaults: disable systemd wait-online if
 NetworkManager is enabled

---
 .../improvedDefaults/default.nix              |  1 +
 .../improvedDefaults/networking.nix           | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)
 create mode 100644 nix/nixos-modules/improvedDefaults/networking.nix

diff --git a/nix/nixos-modules/improvedDefaults/default.nix b/nix/nixos-modules/improvedDefaults/default.nix
index 0263957..0830c5e 100644
--- a/nix/nixos-modules/improvedDefaults/default.nix
+++ b/nix/nixos-modules/improvedDefaults/default.nix
@@ -12,6 +12,7 @@ in
   imports = [
     ./command-not-found.nix
     ./firefox.nix
+    ./networking.nix
     ./powertop-tlp.nix
     ./sshAuthorize.nix
     ./wayland.nix
diff --git a/nix/nixos-modules/improvedDefaults/networking.nix b/nix/nixos-modules/improvedDefaults/networking.nix
new file mode 100644
index 0000000..d9a2eaf
--- /dev/null
+++ b/nix/nixos-modules/improvedDefaults/networking.nix
@@ -0,0 +1,19 @@
+{ config, lib, ... }:
+let
+  cfg = config.x-banananetwork.improvedDefaults;
+  nmEn = config.networking.networkmanager.enable;
+  waitOnlineEn = config.systemd.network.wait-online.enable;
+in
+{
+
+  config = lib.mkIf cfg.enable {
+    systemd.network.wait-online.enable = lib.mkIf nmEn (lib.mkDefault false);
+
+    warnings = lib.singleton (
+      lib.mkIf (nmEn && waitOnlineEn) ''
+        systemd-networkd-wait-online is in most cases useless on systems primarily using NetworkManager & it may increase boot times if it just fails
+      ''
+    );
+  };
+
+}