Lots of stuff

system/services/server/default.nix

@@ -2,16 +2,16 @@
 {
   imports = [
     ./cfdyndns
-    ./fileserver
     ./forgejo
+    ./jellyfin
     ./mysql
+    ./nextcloud
+    ./nfs
     ./owncast
     ./transmission
     ./vaultwarden
     ./webserver
   ];
 
-  options.system = with lib; {
-    server.enable = mkEnableOption "Enable server apps and services";
-  };
+  options.system.server.enable = with lib; mkEnableOption "Enable server apps and services";
 }

system/services/server/fileserver/default.nix

@@ -1,10 +0,0 @@
-{ lib, ... }: 
-{
-  options.system.fileserver.enable = lib.mkEnableOption "Enable file serving services";
-
-  imports = [
-    ./jellyfin
-    ./nextcloud
-    ./nfs
-  ];
-}

system/services/server/nextcloud/default.nix

@@ -2,7 +2,7 @@
 {
   imports = [ ./nginx ];
 
-  config = lib.mkIf config.system.fileserver.enable {
+  config = lib.mkIf config.system.server.enable {
     services.nextcloud = {
       enable = true;
       package = pkgs.nextcloud30;

system/services/server/nfs/default.nix

@@ -1,7 +1,7 @@
 { config, ... }:
 {
   services.nfs.server = {
-    enable = config.system.fileserver.enable;
+    enable = config.system.server.enable;
     exports = ''
       /export/KittyNFS/Files *(rw,sync,no_subtree_check)
       /export/KittyNFS/Media *(rw,sync,no_subtree_check)

system/services/server/webserver/default.nix

@@ -1,9 +1,9 @@
 { lib, ... }: 
 {
-  options.system.webserver.enable = lib.mkEnableOption "Enable nginx related services";
-
   imports = [
     ./acme
     ./nginx
   ];
+
+  options.system.webserver.enable = lib.mkEnableOption "Enable nginx related services";
 }