i...

nixosModules/base.nix

@@ -0,0 +1,29 @@
+{ inputs, ... }@flakeContext:
+{
+  config,
+  lib,
+  xlib,
+  deviceType,
+  ...
+}:
+{
+  imports = with inputs; [
+    ./essentials
+    ./users.nix
+    ./options.nix
+    #./overlays.nix
+    ./temp.nix
+    (./. + "/${deviceType}") # specific modules
+
+    home-manager.nixosModules.home-manager # home-manager module
+    nix-index-database.nixosModules.nix-index # nix-index module
+  ];
+
+  #server.enable = (config.xlib.device.type == "server");
+
+  _module.args.inputs = inputs;
+  _module.args.xlib = config.xlib;
+  services.immich.package = lib.mkIf (
+    config.xlib.device.type == "server"
+  ) inputs.self.packages.x86_64-linux.immich;
+}

nixosModules/default.nix

@@ -1,29 +1,6 @@
-{ inputs, ... }@flakeContext:
+{ ... }@flakeContext:
 {
-  config,
-  lib,
-  xlib,
-  deviceType,
-  ...
-}:
-{
-  imports = with inputs; [
-    ./essentials
-    ./users.nix
-    ./options.nix
-    #./overlays.nix
-    ./temp.nix
-    (./. + "/${deviceType}") # specific modules
-
-    home-manager.nixosModules.home-manager # home-manager module
-    nix-index-database.nixosModules.nix-index # nix-index module
-  ];
-
-  #server.enable = (config.xlib.device.type == "server");
-
-  _module.args.inputs = inputs;
-  _module.args.xlib = config.xlib;
-  services.immich.package = lib.mkIf (
-    config.xlib.device.type == "server"
-  ) inputs.self.packages.x86_64-linux.immich;
+  nixosModules = {
+    default = import ./base.nix flakeContext;
+  };
 }

nixosModules/server/default.nix

@@ -5,8 +5,11 @@
 }:
 {
   imports = [
-    ./stirling-pdf.nix
     #./cloudflared.nix
+    #./nextcloud.nix
+    ../software/beets
     ./immich.nix
+    ./nginx.nix
+    ./stirling-pdf.nix
   ];
 }

nixosModules/server/nextcloud.nix

@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,

nixosModules/server/nginx.nix

@@ -1,4 +1,3 @@
-{ inputs, ... }@flakeContext:
 {
   config,
   lib,