From 467f9a0b3e834d11f2a0444488564f1e8033c72a Mon Sep 17 00:00:00 2001
From: Jurn Wubben <jurnwubben@gmail.com>
Date: Sat, 24 May 2025 14:13:58 +0200
Subject: [PATCH] Merged networking folder into core and services

---
 system/core/default.nix                             | 1 +
 system/{network/default.nix => core/networking.nix} | 5 -----
 system/default.nix                                  | 1 -
 system/{network => services}/avahi.nix              | 0
 system/services/default.nix                         | 2 ++
 system/{network => services}/tailscale.nix          | 0
 6 files changed, 3 insertions(+), 6 deletions(-)
 rename system/{network/default.nix => core/networking.nix} (89%)
 rename system/{network => services}/avahi.nix (100%)
 rename system/{network => services}/tailscale.nix (100%)

diff --git a/system/core/default.nix b/system/core/default.nix
index 7d17299..9c380a6 100644
--- a/system/core/default.nix
+++ b/system/core/default.nix
@@ -3,5 +3,6 @@
     ./boot.nix
     ./users.nix
     ./defaultPackages.nix
+    ./networking.nix
   ];
 }
diff --git a/system/network/default.nix b/system/core/networking.nix
similarity index 89%
rename from system/network/default.nix
rename to system/core/networking.nix
index 8c9c424..1e2eb93 100644
--- a/system/network/default.nix
+++ b/system/core/networking.nix
@@ -1,10 +1,5 @@
 # networking configuration
 {pkgs, ...}: {
-  imports = [
-    ./avahi.nix
-    ./tailscale.nix
-  ];
-
   #FIXME:
   networking = {
     # use quad9 with DNS over TLS
diff --git a/system/default.nix b/system/default.nix
index c57b7cf..f25fab6 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -2,7 +2,6 @@
   imports = [
     ./core
     ./hardware
-    ./network
     ./nix
     ./programs
     ./server
diff --git a/system/network/avahi.nix b/system/services/avahi.nix
similarity index 100%
rename from system/network/avahi.nix
rename to system/services/avahi.nix
diff --git a/system/services/default.nix b/system/services/default.nix
index 8157213..faf6a2f 100644
--- a/system/services/default.nix
+++ b/system/services/default.nix
@@ -1,5 +1,7 @@
 {
   imports = [
+    ./tailscale.nix
+    ./avahi.nix
     ./kanata.nix
     ./power.nix
     ./ssh.nix
diff --git a/system/network/tailscale.nix b/system/services/tailscale.nix
similarity index 100%
rename from system/network/tailscale.nix
rename to system/services/tailscale.nix