From d15762b199b8da971ec7f6d0fa0aba8f0ecd4895 Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Tue, 26 Aug 2025 17:20:27 -0500
Subject: [PATCH] move stuff

---
 .../default.nix                               |  0
 modules/nixos/{ => hardware}/amd/default.nix  |  0
 modules/nixos/{ => hardware}/amd/options.nix  |  0
 .../nixos/hardware/{ => common}/default.nix   |  0
 .../nixos/{ => hardware}/nvidia/default.nix   |  0
 .../nixos/{ => hardware}/nvidia/options.nix   |  0
 .../{ => hardware}/raspberry-pi/default.nix   |  0
 modules/nixos/network/default.nix             |  2 +-
 modules/nixos/ollama/options.nix              |  7 -----
 .../nixos/{ => services}/actual/default.nix   |  0
 .../nixos/{ => services}/actual/options.nix   |  0
 .../nixos/{ollama => services/ai}/default.nix |  2 +-
 modules/nixos/services/ai/options.nix         |  7 +++++
 .../nixos/{ => services}/appimage/default.nix |  0
 modules/nixos/{ => services}/arrs/default.nix |  0
 modules/nixos/{ => services}/arrs/options.nix |  0
 .../nixos/{ => services}/attic/default.nix    |  0
 .../nixos/{ => services}/attic/options.nix    |  0
 .../{ => services}/authentik/default.nix      |  0
 .../{ => services}/authentik/options.nix      |  0
 .../{ => services}/code-server/default.nix    |  0
 .../{ => services}/code-server/options.nix    |  0
 .../nixos/services/{ => common}/default.nix   |  0
 .../nixos/{ => services}/crowdsec/default.nix |  0
 .../nixos/{ => services}/crowdsec/options.nix |  0
 .../nixos/{ => services}/gitea/default.nix    |  0
 .../nixos/{ => services}/gitea/options.nix    |  0
 .../nixos/{ => services}/glances/default.nix  |  0
 .../nixos/{ => services}/glances/options.nix  |  0
 .../nixos/{ => services}/immich/default.nix   |  0
 .../nixos/{ => services}/immich/options.nix   |  0
 .../nixos/{ => services}/jellyfin/default.nix |  0
 .../nixos/{ => services}/jellyfin/options.nix |  0
 .../{ => services}/jellyseerr/default.nix     |  0
 .../{ => services}/jellyseerr/options.nix     |  0
 .../{ => services}/lubelogger/default.nix     |  0
 .../{ => services}/lubelogger/options.nix     |  0
 .../{ => services}/netbootxyz/default.nix     |  0
 .../{ => services}/netbootxyz/options.nix     |  0
 .../{ => services}/nextcloud/default.nix      |  0
 .../{ => services}/nextcloud/options.nix      |  0
 modules/nixos/{ => services}/orca/default.nix |  0
 modules/nixos/{ => services}/orca/options.nix |  0
 .../{ => services}/paperless/default.nix      |  0
 .../{ => services}/paperless/options.nix      |  0
 .../protonmail-bridge/default.nix             |  0
 .../protonmail-bridge/options.nix             |  0
 .../nixos/{ => services}/restic/default.nix   |  0
 .../nixos/{ => services}/restic/options.nix   |  0
 .../nixos/{ => services}/samba/default.nix    |  0
 .../nixos/{ => services}/samba/options.nix    |  0
 .../nixos/{ => services}/traefik/default.nix  |  0
 .../nixos/{ => services}/traefik/options.nix  |  0
 .../nixos/{ => services}/wyoming/default.nix  |  0
 .../nixos/{ => services}/wyoming/options.nix  |  0
 .../x86_64-linux/{nas => jallen-nas}/apps.nix |  0
 .../x86_64-linux/{nas => jallen-nas}/boot.nix |  0
 .../{nas => jallen-nas}/default.nix           |  3 +-
 .../{nas => jallen-nas}/filesystems.nix       |  0
 .../{nas => jallen-nas}/grafana.nix           |  0
 .../hardware-configuration.nix                |  0
 .../{nas => jallen-nas}/networking.nix        | 28 +++++++++----------
 .../{nas => jallen-nas}/samba.nix             |  0
 .../{nas => jallen-nas}/services.nix          |  0
 .../{nas => jallen-nas}/settings.nix          |  0
 .../x86_64-linux/{nas => jallen-nas}/sops.nix |  0
 .../x86_64-linux/{nas => jallen-nas}/ups.nix  |  0
 .../{nas => jallen-nas}/users.nix             |  0
 68 files changed, 24 insertions(+), 25 deletions(-)
 rename homes/x86_64-linux/{admin@nas => admin@jallen-nas}/default.nix (100%)
 rename modules/nixos/{ => hardware}/amd/default.nix (100%)
 rename modules/nixos/{ => hardware}/amd/options.nix (100%)
 rename modules/nixos/hardware/{ => common}/default.nix (100%)
 rename modules/nixos/{ => hardware}/nvidia/default.nix (100%)
 rename modules/nixos/{ => hardware}/nvidia/options.nix (100%)
 rename modules/nixos/{ => hardware}/raspberry-pi/default.nix (100%)
 delete mode 100644 modules/nixos/ollama/options.nix
 rename modules/nixos/{ => services}/actual/default.nix (100%)
 rename modules/nixos/{ => services}/actual/options.nix (100%)
 rename modules/nixos/{ollama => services/ai}/default.nix (97%)
 create mode 100644 modules/nixos/services/ai/options.nix
 rename modules/nixos/{ => services}/appimage/default.nix (100%)
 rename modules/nixos/{ => services}/arrs/default.nix (100%)
 rename modules/nixos/{ => services}/arrs/options.nix (100%)
 rename modules/nixos/{ => services}/attic/default.nix (100%)
 rename modules/nixos/{ => services}/attic/options.nix (100%)
 rename modules/nixos/{ => services}/authentik/default.nix (100%)
 rename modules/nixos/{ => services}/authentik/options.nix (100%)
 rename modules/nixos/{ => services}/code-server/default.nix (100%)
 rename modules/nixos/{ => services}/code-server/options.nix (100%)
 rename modules/nixos/services/{ => common}/default.nix (100%)
 rename modules/nixos/{ => services}/crowdsec/default.nix (100%)
 rename modules/nixos/{ => services}/crowdsec/options.nix (100%)
 rename modules/nixos/{ => services}/gitea/default.nix (100%)
 rename modules/nixos/{ => services}/gitea/options.nix (100%)
 rename modules/nixos/{ => services}/glances/default.nix (100%)
 rename modules/nixos/{ => services}/glances/options.nix (100%)
 rename modules/nixos/{ => services}/immich/default.nix (100%)
 rename modules/nixos/{ => services}/immich/options.nix (100%)
 rename modules/nixos/{ => services}/jellyfin/default.nix (100%)
 rename modules/nixos/{ => services}/jellyfin/options.nix (100%)
 rename modules/nixos/{ => services}/jellyseerr/default.nix (100%)
 rename modules/nixos/{ => services}/jellyseerr/options.nix (100%)
 rename modules/nixos/{ => services}/lubelogger/default.nix (100%)
 rename modules/nixos/{ => services}/lubelogger/options.nix (100%)
 rename modules/nixos/{ => services}/netbootxyz/default.nix (100%)
 rename modules/nixos/{ => services}/netbootxyz/options.nix (100%)
 rename modules/nixos/{ => services}/nextcloud/default.nix (100%)
 rename modules/nixos/{ => services}/nextcloud/options.nix (100%)
 rename modules/nixos/{ => services}/orca/default.nix (100%)
 rename modules/nixos/{ => services}/orca/options.nix (100%)
 rename modules/nixos/{ => services}/paperless/default.nix (100%)
 rename modules/nixos/{ => services}/paperless/options.nix (100%)
 rename modules/nixos/{ => services}/protonmail-bridge/default.nix (100%)
 rename modules/nixos/{ => services}/protonmail-bridge/options.nix (100%)
 rename modules/nixos/{ => services}/restic/default.nix (100%)
 rename modules/nixos/{ => services}/restic/options.nix (100%)
 rename modules/nixos/{ => services}/samba/default.nix (100%)
 rename modules/nixos/{ => services}/samba/options.nix (100%)
 rename modules/nixos/{ => services}/traefik/default.nix (100%)
 rename modules/nixos/{ => services}/traefik/options.nix (100%)
 rename modules/nixos/{ => services}/wyoming/default.nix (100%)
 rename modules/nixos/{ => services}/wyoming/options.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/apps.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/boot.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/default.nix (96%)
 rename systems/x86_64-linux/{nas => jallen-nas}/filesystems.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/grafana.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/hardware-configuration.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/networking.nix (52%)
 rename systems/x86_64-linux/{nas => jallen-nas}/samba.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/services.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/settings.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/sops.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/ups.nix (100%)
 rename systems/x86_64-linux/{nas => jallen-nas}/users.nix (100%)

diff --git a/homes/x86_64-linux/admin@nas/default.nix b/homes/x86_64-linux/admin@jallen-nas/default.nix
similarity index 100%
rename from homes/x86_64-linux/admin@nas/default.nix
rename to homes/x86_64-linux/admin@jallen-nas/default.nix
diff --git a/modules/nixos/amd/default.nix b/modules/nixos/hardware/amd/default.nix
similarity index 100%
rename from modules/nixos/amd/default.nix
rename to modules/nixos/hardware/amd/default.nix
diff --git a/modules/nixos/amd/options.nix b/modules/nixos/hardware/amd/options.nix
similarity index 100%
rename from modules/nixos/amd/options.nix
rename to modules/nixos/hardware/amd/options.nix
diff --git a/modules/nixos/hardware/default.nix b/modules/nixos/hardware/common/default.nix
similarity index 100%
rename from modules/nixos/hardware/default.nix
rename to modules/nixos/hardware/common/default.nix
diff --git a/modules/nixos/nvidia/default.nix b/modules/nixos/hardware/nvidia/default.nix
similarity index 100%
rename from modules/nixos/nvidia/default.nix
rename to modules/nixos/hardware/nvidia/default.nix
diff --git a/modules/nixos/nvidia/options.nix b/modules/nixos/hardware/nvidia/options.nix
similarity index 100%
rename from modules/nixos/nvidia/options.nix
rename to modules/nixos/hardware/nvidia/options.nix
diff --git a/modules/nixos/raspberry-pi/default.nix b/modules/nixos/hardware/raspberry-pi/default.nix
similarity index 100%
rename from modules/nixos/raspberry-pi/default.nix
rename to modules/nixos/hardware/raspberry-pi/default.nix
diff --git a/modules/nixos/network/default.nix b/modules/nixos/network/default.nix
index d2dcad5..b6b9b52 100644
--- a/modules/nixos/network/default.nix
+++ b/modules/nixos/network/default.nix
@@ -18,7 +18,7 @@ in
       hostName = lib.mkForce cfg.hostName;
 
       # Use networkd if enabled
-      useNetworkd = lib.mkIf cfg.useNetworkd true;
+      useNetworkd = lib.mkDefault true;
 
       # Set default gateway and nameservers if in manual mode
       defaultGateway = lib.mkIf (cfg.ipv4.method == "manual") {
diff --git a/modules/nixos/ollama/options.nix b/modules/nixos/ollama/options.nix
deleted file mode 100644
index 1ded552..0000000
--- a/modules/nixos/ollama/options.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ lib, namespace, ... }:
-with lib;
-{
-  options.${namespace}.services.ollama = {
-    enable = mkEnableOption "enable ollama";
-  };
-}
diff --git a/modules/nixos/actual/default.nix b/modules/nixos/services/actual/default.nix
similarity index 100%
rename from modules/nixos/actual/default.nix
rename to modules/nixos/services/actual/default.nix
diff --git a/modules/nixos/actual/options.nix b/modules/nixos/services/actual/options.nix
similarity index 100%
rename from modules/nixos/actual/options.nix
rename to modules/nixos/services/actual/options.nix
diff --git a/modules/nixos/ollama/default.nix b/modules/nixos/services/ai/default.nix
similarity index 97%
rename from modules/nixos/ollama/default.nix
rename to modules/nixos/services/ai/default.nix
index 0e09dc7..650e428 100755
--- a/modules/nixos/ollama/default.nix
+++ b/modules/nixos/services/ai/default.nix
@@ -7,7 +7,7 @@
 }:
 with lib;
 let
-  cfg = config.${namespace}.services.ollama;
+  cfg = config.${namespace}.services.ai;
 in
 {
   imports = [ ./options.nix ];
diff --git a/modules/nixos/services/ai/options.nix b/modules/nixos/services/ai/options.nix
new file mode 100644
index 0000000..cc0dbb8
--- /dev/null
+++ b/modules/nixos/services/ai/options.nix
@@ -0,0 +1,7 @@
+{ lib, namespace, ... }:
+with lib;
+{
+  options.${namespace}.services.ai = {
+    enable = mkEnableOption "enable ai";
+  };
+}
diff --git a/modules/nixos/appimage/default.nix b/modules/nixos/services/appimage/default.nix
similarity index 100%
rename from modules/nixos/appimage/default.nix
rename to modules/nixos/services/appimage/default.nix
diff --git a/modules/nixos/arrs/default.nix b/modules/nixos/services/arrs/default.nix
similarity index 100%
rename from modules/nixos/arrs/default.nix
rename to modules/nixos/services/arrs/default.nix
diff --git a/modules/nixos/arrs/options.nix b/modules/nixos/services/arrs/options.nix
similarity index 100%
rename from modules/nixos/arrs/options.nix
rename to modules/nixos/services/arrs/options.nix
diff --git a/modules/nixos/attic/default.nix b/modules/nixos/services/attic/default.nix
similarity index 100%
rename from modules/nixos/attic/default.nix
rename to modules/nixos/services/attic/default.nix
diff --git a/modules/nixos/attic/options.nix b/modules/nixos/services/attic/options.nix
similarity index 100%
rename from modules/nixos/attic/options.nix
rename to modules/nixos/services/attic/options.nix
diff --git a/modules/nixos/authentik/default.nix b/modules/nixos/services/authentik/default.nix
similarity index 100%
rename from modules/nixos/authentik/default.nix
rename to modules/nixos/services/authentik/default.nix
diff --git a/modules/nixos/authentik/options.nix b/modules/nixos/services/authentik/options.nix
similarity index 100%
rename from modules/nixos/authentik/options.nix
rename to modules/nixos/services/authentik/options.nix
diff --git a/modules/nixos/code-server/default.nix b/modules/nixos/services/code-server/default.nix
similarity index 100%
rename from modules/nixos/code-server/default.nix
rename to modules/nixos/services/code-server/default.nix
diff --git a/modules/nixos/code-server/options.nix b/modules/nixos/services/code-server/options.nix
similarity index 100%
rename from modules/nixos/code-server/options.nix
rename to modules/nixos/services/code-server/options.nix
diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/common/default.nix
similarity index 100%
rename from modules/nixos/services/default.nix
rename to modules/nixos/services/common/default.nix
diff --git a/modules/nixos/crowdsec/default.nix b/modules/nixos/services/crowdsec/default.nix
similarity index 100%
rename from modules/nixos/crowdsec/default.nix
rename to modules/nixos/services/crowdsec/default.nix
diff --git a/modules/nixos/crowdsec/options.nix b/modules/nixos/services/crowdsec/options.nix
similarity index 100%
rename from modules/nixos/crowdsec/options.nix
rename to modules/nixos/services/crowdsec/options.nix
diff --git a/modules/nixos/gitea/default.nix b/modules/nixos/services/gitea/default.nix
similarity index 100%
rename from modules/nixos/gitea/default.nix
rename to modules/nixos/services/gitea/default.nix
diff --git a/modules/nixos/gitea/options.nix b/modules/nixos/services/gitea/options.nix
similarity index 100%
rename from modules/nixos/gitea/options.nix
rename to modules/nixos/services/gitea/options.nix
diff --git a/modules/nixos/glances/default.nix b/modules/nixos/services/glances/default.nix
similarity index 100%
rename from modules/nixos/glances/default.nix
rename to modules/nixos/services/glances/default.nix
diff --git a/modules/nixos/glances/options.nix b/modules/nixos/services/glances/options.nix
similarity index 100%
rename from modules/nixos/glances/options.nix
rename to modules/nixos/services/glances/options.nix
diff --git a/modules/nixos/immich/default.nix b/modules/nixos/services/immich/default.nix
similarity index 100%
rename from modules/nixos/immich/default.nix
rename to modules/nixos/services/immich/default.nix
diff --git a/modules/nixos/immich/options.nix b/modules/nixos/services/immich/options.nix
similarity index 100%
rename from modules/nixos/immich/options.nix
rename to modules/nixos/services/immich/options.nix
diff --git a/modules/nixos/jellyfin/default.nix b/modules/nixos/services/jellyfin/default.nix
similarity index 100%
rename from modules/nixos/jellyfin/default.nix
rename to modules/nixos/services/jellyfin/default.nix
diff --git a/modules/nixos/jellyfin/options.nix b/modules/nixos/services/jellyfin/options.nix
similarity index 100%
rename from modules/nixos/jellyfin/options.nix
rename to modules/nixos/services/jellyfin/options.nix
diff --git a/modules/nixos/jellyseerr/default.nix b/modules/nixos/services/jellyseerr/default.nix
similarity index 100%
rename from modules/nixos/jellyseerr/default.nix
rename to modules/nixos/services/jellyseerr/default.nix
diff --git a/modules/nixos/jellyseerr/options.nix b/modules/nixos/services/jellyseerr/options.nix
similarity index 100%
rename from modules/nixos/jellyseerr/options.nix
rename to modules/nixos/services/jellyseerr/options.nix
diff --git a/modules/nixos/lubelogger/default.nix b/modules/nixos/services/lubelogger/default.nix
similarity index 100%
rename from modules/nixos/lubelogger/default.nix
rename to modules/nixos/services/lubelogger/default.nix
diff --git a/modules/nixos/lubelogger/options.nix b/modules/nixos/services/lubelogger/options.nix
similarity index 100%
rename from modules/nixos/lubelogger/options.nix
rename to modules/nixos/services/lubelogger/options.nix
diff --git a/modules/nixos/netbootxyz/default.nix b/modules/nixos/services/netbootxyz/default.nix
similarity index 100%
rename from modules/nixos/netbootxyz/default.nix
rename to modules/nixos/services/netbootxyz/default.nix
diff --git a/modules/nixos/netbootxyz/options.nix b/modules/nixos/services/netbootxyz/options.nix
similarity index 100%
rename from modules/nixos/netbootxyz/options.nix
rename to modules/nixos/services/netbootxyz/options.nix
diff --git a/modules/nixos/nextcloud/default.nix b/modules/nixos/services/nextcloud/default.nix
similarity index 100%
rename from modules/nixos/nextcloud/default.nix
rename to modules/nixos/services/nextcloud/default.nix
diff --git a/modules/nixos/nextcloud/options.nix b/modules/nixos/services/nextcloud/options.nix
similarity index 100%
rename from modules/nixos/nextcloud/options.nix
rename to modules/nixos/services/nextcloud/options.nix
diff --git a/modules/nixos/orca/default.nix b/modules/nixos/services/orca/default.nix
similarity index 100%
rename from modules/nixos/orca/default.nix
rename to modules/nixos/services/orca/default.nix
diff --git a/modules/nixos/orca/options.nix b/modules/nixos/services/orca/options.nix
similarity index 100%
rename from modules/nixos/orca/options.nix
rename to modules/nixos/services/orca/options.nix
diff --git a/modules/nixos/paperless/default.nix b/modules/nixos/services/paperless/default.nix
similarity index 100%
rename from modules/nixos/paperless/default.nix
rename to modules/nixos/services/paperless/default.nix
diff --git a/modules/nixos/paperless/options.nix b/modules/nixos/services/paperless/options.nix
similarity index 100%
rename from modules/nixos/paperless/options.nix
rename to modules/nixos/services/paperless/options.nix
diff --git a/modules/nixos/protonmail-bridge/default.nix b/modules/nixos/services/protonmail-bridge/default.nix
similarity index 100%
rename from modules/nixos/protonmail-bridge/default.nix
rename to modules/nixos/services/protonmail-bridge/default.nix
diff --git a/modules/nixos/protonmail-bridge/options.nix b/modules/nixos/services/protonmail-bridge/options.nix
similarity index 100%
rename from modules/nixos/protonmail-bridge/options.nix
rename to modules/nixos/services/protonmail-bridge/options.nix
diff --git a/modules/nixos/restic/default.nix b/modules/nixos/services/restic/default.nix
similarity index 100%
rename from modules/nixos/restic/default.nix
rename to modules/nixos/services/restic/default.nix
diff --git a/modules/nixos/restic/options.nix b/modules/nixos/services/restic/options.nix
similarity index 100%
rename from modules/nixos/restic/options.nix
rename to modules/nixos/services/restic/options.nix
diff --git a/modules/nixos/samba/default.nix b/modules/nixos/services/samba/default.nix
similarity index 100%
rename from modules/nixos/samba/default.nix
rename to modules/nixos/services/samba/default.nix
diff --git a/modules/nixos/samba/options.nix b/modules/nixos/services/samba/options.nix
similarity index 100%
rename from modules/nixos/samba/options.nix
rename to modules/nixos/services/samba/options.nix
diff --git a/modules/nixos/traefik/default.nix b/modules/nixos/services/traefik/default.nix
similarity index 100%
rename from modules/nixos/traefik/default.nix
rename to modules/nixos/services/traefik/default.nix
diff --git a/modules/nixos/traefik/options.nix b/modules/nixos/services/traefik/options.nix
similarity index 100%
rename from modules/nixos/traefik/options.nix
rename to modules/nixos/services/traefik/options.nix
diff --git a/modules/nixos/wyoming/default.nix b/modules/nixos/services/wyoming/default.nix
similarity index 100%
rename from modules/nixos/wyoming/default.nix
rename to modules/nixos/services/wyoming/default.nix
diff --git a/modules/nixos/wyoming/options.nix b/modules/nixos/services/wyoming/options.nix
similarity index 100%
rename from modules/nixos/wyoming/options.nix
rename to modules/nixos/services/wyoming/options.nix
diff --git a/systems/x86_64-linux/nas/apps.nix b/systems/x86_64-linux/jallen-nas/apps.nix
similarity index 100%
rename from systems/x86_64-linux/nas/apps.nix
rename to systems/x86_64-linux/jallen-nas/apps.nix
diff --git a/systems/x86_64-linux/nas/boot.nix b/systems/x86_64-linux/jallen-nas/boot.nix
similarity index 100%
rename from systems/x86_64-linux/nas/boot.nix
rename to systems/x86_64-linux/jallen-nas/boot.nix
diff --git a/systems/x86_64-linux/nas/default.nix b/systems/x86_64-linux/jallen-nas/default.nix
similarity index 96%
rename from systems/x86_64-linux/nas/default.nix
rename to systems/x86_64-linux/jallen-nas/default.nix
index f4d2804..97ac32e 100755
--- a/systems/x86_64-linux/nas/default.nix
+++ b/systems/x86_64-linux/jallen-nas/default.nix
@@ -15,7 +15,7 @@
     ./boot.nix
     ./apps.nix
     ./grafana.nix
-    # ./networking.nix - moved to modules/nixos/network
+    ./networking.nix # - moved to modules/nixos/network
     ./ups.nix
     ./users.nix
     ./samba.nix
@@ -48,7 +48,6 @@
       enableNvidiaDocker = true;
     };
     network = {
-      hostName = "jallen-nas";
       ipv4 = {
         address = "10.0.1.3/24";
         method = "manual";
diff --git a/systems/x86_64-linux/nas/filesystems.nix b/systems/x86_64-linux/jallen-nas/filesystems.nix
similarity index 100%
rename from systems/x86_64-linux/nas/filesystems.nix
rename to systems/x86_64-linux/jallen-nas/filesystems.nix
diff --git a/systems/x86_64-linux/nas/grafana.nix b/systems/x86_64-linux/jallen-nas/grafana.nix
similarity index 100%
rename from systems/x86_64-linux/nas/grafana.nix
rename to systems/x86_64-linux/jallen-nas/grafana.nix
diff --git a/systems/x86_64-linux/nas/hardware-configuration.nix b/systems/x86_64-linux/jallen-nas/hardware-configuration.nix
similarity index 100%
rename from systems/x86_64-linux/nas/hardware-configuration.nix
rename to systems/x86_64-linux/jallen-nas/hardware-configuration.nix
diff --git a/systems/x86_64-linux/nas/networking.nix b/systems/x86_64-linux/jallen-nas/networking.nix
similarity index 52%
rename from systems/x86_64-linux/nas/networking.nix
rename to systems/x86_64-linux/jallen-nas/networking.nix
index 286b84e..6eb8083 100755
--- a/systems/x86_64-linux/nas/networking.nix
+++ b/systems/x86_64-linux/jallen-nas/networking.nix
@@ -10,7 +10,7 @@ let
     10200
     10300
     8127
-    9980 # onlyoffice
+    9943 # onlyoffice
     4000 # netbootxyz
     4080 # netbootxyz
     3000 # gitea
@@ -28,27 +28,27 @@ in
 {
   # Networking configs
   networking = {
-    useNetworkd = true;
+    # useNetworkd = true;
 
-    hostId = "4b501480";
+    # hostId = "4b501480";
 
-    nat = {
-      enable = true;
-      internalInterfaces = [ "ve-+" ];
-      externalInterface = "wlp6s0";
-      # Lazy IPv6 connectivity for the container
-      enableIPv6 = true;
-    };
+    # nat = {
+    #   enable = true;
+    #   internalInterfaces = [ "ve-+" ];
+    #   externalInterface = "wlp6s0";
+    #   # Lazy IPv6 connectivity for the container
+    #   enableIPv6 = true;
+    # };
 
     firewall = {
-      enable = true;
-      allowPing = true;
+      # enable = true;
+      # allowPing = true;
 
       allowedTCPPorts = ports;
       allowedUDPPorts = ports;
 
-      # always allow traffic from your Tailscale network
-      trustedInterfaces = [ "tailscale0" ];
+      # # always allow traffic from your Tailscale network
+      # trustedInterfaces = [ "tailscale0" ];
     };
   };
 }
diff --git a/systems/x86_64-linux/nas/samba.nix b/systems/x86_64-linux/jallen-nas/samba.nix
similarity index 100%
rename from systems/x86_64-linux/nas/samba.nix
rename to systems/x86_64-linux/jallen-nas/samba.nix
diff --git a/systems/x86_64-linux/nas/services.nix b/systems/x86_64-linux/jallen-nas/services.nix
similarity index 100%
rename from systems/x86_64-linux/nas/services.nix
rename to systems/x86_64-linux/jallen-nas/services.nix
diff --git a/systems/x86_64-linux/nas/settings.nix b/systems/x86_64-linux/jallen-nas/settings.nix
similarity index 100%
rename from systems/x86_64-linux/nas/settings.nix
rename to systems/x86_64-linux/jallen-nas/settings.nix
diff --git a/systems/x86_64-linux/nas/sops.nix b/systems/x86_64-linux/jallen-nas/sops.nix
similarity index 100%
rename from systems/x86_64-linux/nas/sops.nix
rename to systems/x86_64-linux/jallen-nas/sops.nix
diff --git a/systems/x86_64-linux/nas/ups.nix b/systems/x86_64-linux/jallen-nas/ups.nix
similarity index 100%
rename from systems/x86_64-linux/nas/ups.nix
rename to systems/x86_64-linux/jallen-nas/ups.nix
diff --git a/systems/x86_64-linux/nas/users.nix b/systems/x86_64-linux/jallen-nas/users.nix
similarity index 100%
rename from systems/x86_64-linux/nas/users.nix
rename to systems/x86_64-linux/jallen-nas/users.nix