nix flake update

flake.lock

@@ -191,11 +191,11 @@
     },
     "nixpkgs-master": {
       "locked": {
-        "lastModified": 1783276901,
+        "lastModified": 1783254900,
-        "narHash": "sha256-ShZcHjvXc/Q4ew9ehgT5w3hjG1J8HX2opzm8+is1Ic8=",
+        "narHash": "sha256-bnEPsI9hqDdjCj0aGaWn7dGLAzvAZZnQxuQ/sRFSRfM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "eaf066ffc52fb96d433d75bac80f675bc0672928",
+        "rev": "8c6381d366e3015b18b195f7b1b2ac9959f2b552",
         "type": "github"
       },
       "original": {
@@ -205,22 +205,6 @@
         "type": "github"
       }
     },
-    "nixpkgs-previous": {
-      "locked": {
-        "lastModified": 1767892417,
-        "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba",
-        "type": "github"
-      }
-    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1782847189,
@@ -309,7 +293,6 @@
         "nixpkgs-beets": "nixpkgs-beets",
         "nixpkgs-calibre": "nixpkgs-calibre",
         "nixpkgs-master": "nixpkgs-master",
-        "nixpkgs-previous": "nixpkgs-previous",
         "nixpkgs-stable": "nixpkgs-stable",
         "plasma-manager": "plasma-manager",
         "proxy-suite": "proxy-suite",

flake.nix

@@ -9,7 +9,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     # nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f";
     nixpkgs-calibre.url = "github:NixOS/nixpkgs/566acc07c54dc807f91625bb286cb9b321b5f42a";
-    nixpkgs-previous.url = "github:NixOS/nixpkgs/3497aa5c9457a9d88d71fa93a4a8368816fbeeba";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
     nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixpkgs-beets.url = "github:NixOS/nixpkgs/832efc09b4caf6b4569fbf9dc01bec3082a00611"; # 2343bbb58f99267223bc2aac4fc9ea301a155a16

modules/essentials/settings.nix

@@ -27,7 +27,7 @@
         # "https://nixos.snix.store" # https://nixos.snix.store/
       ];
       trusted-public-keys = [
-        "nix-cache.home.arpa:be5jFLkiwNyOep/McxSafB3jguBmztxx+oJ46ySyc/s="
+        "cache.local:be5jFLkiwNyOep/McxSafB3jguBmztxx+oJ46ySyc/s="
         "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
       ];
       stalled-download-timeout = 8;

modules/server/bentopdf.nix

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

modules/server/calibre-web.nix

@@ -13,7 +13,7 @@ in
 {
   services = {
     calibre-web = {
-      # package = stable.calibre-web;
+      package = stable.calibre-web;
       enable = true;
       # dataDir = "${xlib.dirs.services-mnt-folder}/calibre-web";
       options = {

modules/server/coredns.nix

@@ -30,7 +30,6 @@
       }
       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
@@ -43,7 +42,6 @@
               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,6 +14,7 @@
     ./glances.nix
     ./immich.nix
     ./miniflux.nix
+    ./netdata.nix
     ./nextcloud.nix
     ./nginx.nix
     ./nix-serve.nix
@@ -28,7 +29,6 @@
     # ./memos.nix
     # ./n8n.nix
     # ./navidrome.nix
-    # ./netdata.nix
     # ./nfs.nix
     # ./node-red.nix
     # ./open-webui.nix

modules/server/nix-serve.nix

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

modules/server/stirling-pdf.nix

@@ -0,0 +1,17 @@
+{
+  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;
+    };
+  };
+}

modules/wsl/default.nix

@@ -10,7 +10,6 @@
     ../software/beets
     ../software/whisper.nix
     ./containers
-    ./nix-serve.nix
     ./tools
     #../server/open-webui.nix
     #../services/tts.nix

modules/wsl/nix-serve.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  services = {
-    nix-serve = {
-      enable = true;
-      package = pkgs.nix-serve-ng;
-      openFirewall = true;
-      port = 5000;
-      bindAddress = "0.0.0.0";
-      secretKeyFile = config.sops.secrets.private-key.path;
-    };
-  };
-  sops.secrets = {
-    private-key = {
-      key = "private-key";
-      sopsFile = ./secrets/nix-serve.yaml;
-      mode = "0600";
-    };
-  };
-}

modules/wsl/secrets/nix-serve.yaml

@@ -1,16 +0,0 @@
-private-key: ENC[AES256_GCM,data:VTj1cmhYLbBuUnIgtXI3CZtULaNZ5XOpoheJB0gUwrWrH5B0rmxcvZLlJWX7xhGs4oqcC3Wwmo+TBPhcgGylLVdCuhJG5A94UwOa9ZIV4s3x3IJ4RU3UcHTsA0xdtw7XxBfryw==,iv:8oZCojIU0JXWJgE5t+fNNW9trC109yOJp1UGAV76FbU=,tag:S74cHFy9B8C29npdcoVBeg==,type:str]
-sops:
-    age:
-        - recipient: age13l2gtk0nzr484zprp7e0pkrt0ne0j4asyn2pjmlaw73nte7t7d8q4sqtxm
-          enc: |
-            -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB6MHBkYzZneEdhUlN5MEpx
-            NGxud1BkVU1NUFdyVFE2VDJWb1M2cW9IcUVFCm9QZ3RvNHFaeWpFbnZ3Q1dKSDdn
-            RHQvUDgrZHRiUHpSR3FrWXRkQUxXWGMKLS0tIERsemNuL1BwR2xYYUpmbVFROWtN
-            RGI1WlRGMzlkS2tqQ0JPSFJHTUY1TUkKDeaivc+ST8MYtnJEDx07Y+IhtpvblR47
-            SLZf6WKQ8WNY4Bb5VeMWiCABPP/2L+VwoACqkOdZ01yGUVQSc9X6tw==
-            -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2026-05-03T17:05:41Z"
-    mac: ENC[AES256_GCM,data:6jNp7N7lIvsLez3zQbDKTWPyvkL8u9g34I3q27GudgXzYw8B3Pb26jc9dCYCxCylCZxN5IeWWyHvUt4PadQABI4jrrIKnIfVV1A2c+A90chu+xSyE/B9OhkSC7yYVOnCURJPYku8799RIRkpHAWeKawkydbOiszCiC3qIKZDSTQ=,iv:xXivLDNnTABlNeWOOWsCESDUOnFv+9Lh0o029r7rk+A=,tag:vUoIZjcNtE3xJX/jNCao7Q==,type:str]
-    unencrypted_suffix: _unencrypted
-    version: 3.12.2