nix flake update

modules/server/bentopdf.nix

@@ -3,9 +3,6 @@
   inputs,
   ...
 }:
-# let
-#   pkgs-stable = import inputs.nixpkgs-stable { system = "x86_64-linux"; };
-# in
 {
   services.bentopdf = {
     enable = true;

modules/server/calibre-web.nix

@@ -11,27 +11,50 @@ let
   };
 in
 {
-  services.calibre-web = {
-    package = stable.calibre-web;
-    enable = true;
-    # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
-    options = {
-      calibreLibrary = "${xlib.dirs.services-mnt-folder}/calibre-web-library";
-      enableBookUploading = true;
-      enableKepubify = true;
-      enableBookConversion = false;
+  services = {
+    calibre-web = {
+      # package = stable.calibre-web;
+      enable = true;
+      # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
+      options = {
+        calibreLibrary = "${xlib.dirs.services-mnt-folder}/calibre-web-library";
+        enableBookUploading = true;
+        enableKepubify = true;
+        enableBookConversion = false;
+      };
+      listen.ip = "0.0.0.0";
+      listen.port = 8083;
+      openFirewall = true;
     };
-    listen.ip = "0.0.0.0";
-    listen.port = 8083;
-    openFirewall = true;
+    # calibre-server = {
+    #   enable = true;
+    #   port = 8091;
+    #   host = "0.0.0.0";
+    #   openFirewall = true;
+    #   user = "calibre-web";
+    #   group = "calibre-web";
+    #   libraries = [
+    #     "/var/lib/calibre-server"
+    #   ];
+    # };
   };
 
-  fileSystems."/var/lib/calibre-web" = {
-    device = "${xlib.dirs.services-mnt-folder}/calibre-web";
-    fsType = "none";
-    options = [
-      "bind"
-      "nofail"
-    ];
+  fileSystems = {
+    "/var/lib/calibre-web" = {
+      device = "${xlib.dirs.services-mnt-folder}/calibre-web";
+      fsType = "none";
+      options = [
+        "bind"
+        "nofail"
+      ];
+    };
+    # "/var/lib/calibre-server" = {
+    #   device = "${xlib.dirs.services-mnt-folder}/calibre-web-library";
+    #   fsType = "none";
+    #   options = [
+    #     "bind"
+    #     "nofail"
+    #   ];
+    # };
   };
 }

modules/server/coredns.nix

@@ -30,6 +30,7 @@
       }
       home.arpa:53 {
           hosts {
+              192.168.1.100 vetymae.home.arpa
               192.168.1.20 ca.home.arpa
               192.168.1.20 calibre.home.arpa
               192.168.1.20 dns.home.arpa
@@ -42,6 +43,7 @@
               192.168.1.20 nextcloud.home.arpa
               192.168.1.20 office.home.arpa
               192.168.1.20 pdf.home.arpa
+              192.168.1.20 sapphira.home.arpa
               192.168.1.20 syncthing.home.arpa
               fallthrough
           }

modules/server/default.nix

@@ -14,7 +14,6 @@
     ./glances.nix
     ./immich.nix
     ./miniflux.nix
-    ./netdata.nix
     ./nextcloud.nix
     ./nginx.nix
     ./nix-serve.nix
@@ -29,6 +28,7 @@
     # ./memos.nix
     # ./n8n.nix
     # ./navidrome.nix
+    # ./netdata.nix
     # ./nfs.nix
     # ./node-red.nix
     # ./open-webui.nix

modules/server/nextcloud.nix

@@ -7,10 +7,10 @@
   ...
 }:
 let
-  master = import inputs.nixpkgs-master {
+  previous = import inputs.nixpkgs-master {
     system = "x86_64-linux";
-    # config.allowUnfree = true;
-    # config.allowUnfreePredicate = true;
+    config.allowUnfree = true;
+    config.allowUnfreePredicate = true;
   };
 in
 {
@@ -172,6 +172,7 @@ in
     # };
     onlyoffice = {
       enable = true;
+      package = previous.onlyoffice-documentserver;
       hostname = "office.home.arpa";
       port = 8090;
       allowLocalConnections = true;

modules/server/nginx.nix

@@ -57,7 +57,7 @@ in
             }
             {
               addr = "127.0.0.1";
-              port = 10000;
+              port = 8446;
             }
           ];
           extraConfig = ''

modules/server/nix-serve.nix

@@ -8,6 +8,7 @@
   services = {
     nix-serve = {
       enable = true;
+      package = pkgs.nix-serve-ng;
       openFirewall = true;
       port = 5000;
       bindAddress = "0.0.0.0";

modules/server/stirling-pdf.nix

@@ -1,17 +0,0 @@
-{
-  config,
-  inputs,
-  ...
-}:
-# let
-#   pkgs-stable = import inputs.nixpkgs-stable { system = "x86_64-linux"; };
-# in
-{
-  services.stirling-pdf = {
-    enable = false;
-    # package = pkgs-stable.stirling-pdf;
-    environment = {
-      SERVER_PORT = 6060;
-    };
-  };
-}