From bf48d7dfb2f32cb1a8cfd9c760d40419f2f823b6 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 21 Apr 2025 23:34:13 -0400
Subject: [PATCH] fixes of things

---
 etcnixos/common.nix     |  5 ++---
 etcnixos/networking.nix | 26 +++++++++++++++-----------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/etcnixos/common.nix b/etcnixos/common.nix
index 4020b40..c45e4c6 100644
--- a/etcnixos/common.nix
+++ b/etcnixos/common.nix
@@ -14,6 +14,7 @@
     ./distrobox.nix
     ./vm.nix
     ./steam.nix
+    ./networking.nix
 
     inputs.agenix.nixosModules.default
     inputs.nixos-hardware.nixosModules.common-pc-ssd
@@ -21,6 +22,7 @@
     inputs.disko.nixosModules.disko
   ];
 
+  # I think this was causing the weird kworker freezing issue??
   services.fstrim.enable = false;
 
   programs.nix-ld = {
@@ -128,9 +130,6 @@
 
   # age.identityPaths = [ "/home/${username}/.ssh/id_ed25519" ];
 
-  # networking
-  networking = import ./networking.nix { inherit hostname; };
-
   # Select internationalisation properties.
   i18n.defaultLocale = "en_US.UTF-8";
 
diff --git a/etcnixos/networking.nix b/etcnixos/networking.nix
index 4d52c15..0042b92 100644
--- a/etcnixos/networking.nix
+++ b/etcnixos/networking.nix
@@ -1,19 +1,23 @@
 { hostname, ... }:
 {
-  hostName = hostname;
+  systemd.services.NetworkManager-wait-online.enable = false;
 
-  networkmanager = {
-    enable = true;
+  networking = {
+    hostName = hostname;
 
-    insertNameservers = [
-      "1.1.1.1"
-      "9.9.9.9"
-    ];
+    networkmanager = {
+      enable = true;
 
-    wifi = {
-      scanRandMacAddress = true;
+      insertNameservers = [
+        "1.1.1.1"
+        "9.9.9.9"
+      ];
+
+      wifi = {
+        scanRandMacAddress = true;
+      };
     };
-  };
 
-  wireless.networks = import ./secrets/wifi-passwords.nix;
+    wireless.networks = import ./secrets/wifi-passwords.nix;
+  };
 }