4 files changed, 18 insertions, 17 deletions
diff --git a/hosts/common/server/default.nix b/hosts/common/server/default.nix
deleted file mode 100644
index 2986f66..0000000
--- a/hosts/common/server/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ config, pkgs, lib, ... }:
-
-{
-  imports = [
-    ./monitoring.nix
-  ];
-}
diff --git a/hosts/common/nas.nix b/hosts/profiles/nas.nix
index dd6d81d..10ba67c 100644
--- a/hosts/common/nas.nix
+++ b/hosts/profiles/nas.nix
@@ -2,15 +2,16 @@
 
 {
   imports = [
-    ./server/default.nix
-    ./server/samba.nix
-    ./server/prometheus.nix
-    ./server/grafana.nix
-    ./server/traefik.nix
-    ./server/transmission.nix
-    ./server/unifi.nix
-    ./server/gitea.nix
-    ./server/rclone.nix
+    # other profiles
+    ./server.nix
+    ../common/server/samba.nix
+    ../common/server/prometheus.nix
+    ../common/server/grafana.nix
+    ../common/server/traefik.nix
+    ../common/server/transmission.nix
+    ../common/server/unifi.nix
+    ../common/server/gitea.nix
+    ../common/server/rclone.nix
   ];
 
   users.groups.nas.gid = 5000;
diff --git a/hosts/profiles/server.nix b/hosts/profiles/server.nix
new file mode 100644
index 0000000..667b828
--- /dev/null
+++ b/hosts/profiles/server.nix
@@ -0,0 +1,7 @@
+o{ config, pkgs, lib, ... }:
+
+{
+  imports = [
+    ../common/server/monitoring.nix
+  ];
+}
diff --git a/hosts/tahoe/default.nix b/hosts/tahoe/default.nix
index 8d78461..5a746dd 100644
--- a/hosts/tahoe/default.nix
+++ b/hosts/tahoe/default.nix
@@ -3,7 +3,7 @@
 {
   imports = [ # Include the results of the hardware scan.
     ./hardware-configuration.nix
-    ../common/nas.nix
+    ../profiles/nas.nix
     ../common/system/tailscale.nix
   ];