cleanup

modules/nixos/services/calibre/default.nix

@@ -5,10 +5,10 @@
   namespace,
   ...
 }:
-with lib;
 let
   name = "calibre";
   cfg = config.${namespace}.services.${name};
+  cfgWeb = config.${namespace}.services."${name}-web";
 
   calibreConfig = lib.${namespace}.mkModule {
     inherit config name;
@@ -16,15 +16,11 @@ let
     description = "Calibre Server";
     options = { };
     moduleConfig = {
-      services = {
-        calibre-server = {
-          enable = false;
-          openFirewall = true;
-          port = cfg.port;
-          libraries = [
-            "${cfg.dataDir}/books"
-          ];
-        };
+      services.calibre-server = {
+        enable = false;
+        openFirewall = true;
+        port = cfg.port;
+        libraries = [ "${cfg.dataDir}/books" ];
       };
     };
   };
@@ -39,15 +35,15 @@ let
         enable = true;
         openFirewall = true;
         package = pkgs.stable.calibre-web;
-        dataDir = "${cfg.configDir}/calibre-web";
+        dataDir = "${cfgWeb.configDir}/calibre-web";
         listen = {
           ip = "0.0.0.0";
-          port = cfg.port;
+          port = cfgWeb.port;
         };
         options = {
           enableBookUploading = true;
           enableBookConversion = true;
-          calibreLibrary = "${cfg.dataDir}/books";
+          calibreLibrary = "${cfgWeb.dataDir}/books";
         };
       };
     };