From 5dd7a585a532302ffcfb29ca3d9ffeb339c23ae9 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sat, 4 Jul 2026 23:29:10 +0300 Subject: [PATCH] nix flake update --- flake.lock | 55 +++++++++++++++++---------- flake.nix | 1 + modules/essentials/settings.nix | 2 +- modules/server/bentopdf.nix | 3 -- modules/server/calibre-web.nix | 61 ++++++++++++++++++++---------- modules/server/coredns.nix | 2 + modules/server/default.nix | 2 +- modules/server/nextcloud.nix | 7 ++-- modules/server/nginx.nix | 2 +- modules/server/nix-serve.nix | 1 + modules/server/stirling-pdf.nix | 17 --------- modules/wsl/default.nix | 1 + modules/wsl/nix-serve.nix | 25 ++++++++++++ modules/wsl/secrets/nix-serve.yaml | 16 ++++++++ 14 files changed, 131 insertions(+), 64 deletions(-) delete mode 100644 modules/server/stirling-pdf.nix create mode 100644 modules/wsl/nix-serve.nix create mode 100644 modules/wsl/secrets/nix-serve.yaml diff --git a/flake.lock b/flake.lock index b3568c6..8c56c2d 100644 --- a/flake.lock +++ b/flake.lock @@ -88,11 +88,11 @@ ] }, "locked": { - "lastModified": 1781989573, - "narHash": "sha256-npfH7Zv7t1akX/ArqCNro4zU4ViPlghLaPnbEfHbCxk=", + "lastModified": 1783222121, + "narHash": "sha256-E/ElL373TO8lQ2aMvYyzN+k4xkVaUGoRqoa8AtM71tI=", "owner": "nix-community", "repo": "home-manager", - "rev": "78e7d8b13ecd7f5256a5c11ce216876164099d9f", + "rev": "a1645f40777620c4bd2b6d854b290c2fc354a266", "type": "github" }, "original": { @@ -106,11 +106,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1781622756, - "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", + "lastModified": 1782562157, + "narHash": "sha256-a7+T6QSeowynwZ1ZJJbP8T8ntAytvrui8kFGJmIZt2c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", + "rev": "a9cf7546a938c737b079e738de73934a13de9784", "type": "github" }, "original": { @@ -191,11 +191,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1782027080, - "narHash": "sha256-+swil9tg3vzwDC8J/Zgsty7ifxiqzWbE98hceRmcYrU=", + "lastModified": 1783276901, + "narHash": "sha256-ShZcHjvXc/Q4ew9ehgT5w3hjG1J8HX2opzm8+is1Ic8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "85cea9e124238e3087be7816c11cbd71a9b40bc1", + "rev": "eaf066ffc52fb96d433d75bac80f675bc0672928", "type": "github" }, "original": { @@ -205,13 +205,29 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs-previous": { "locked": { - "lastModified": 1781509190, - "narHash": "sha256-uJZs9Di8I6ciTp6jiojj0HzlNpBkud8ax5aT/O5aJkw=", + "lastModified": 1767892417, + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d6df3513510aa548c83868fd22bfddd0a8c0a0d4", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", + "type": "github" + } + }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1782847189, + "narHash": "sha256-twXPFqFsrrY5r28Zh7Homgcp2gUMBgQ6WDS98Q/3xFI=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "b6018f87da91d19d0ab4cf979885689b469cdd41", "type": "github" }, "original": { @@ -223,11 +239,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1782959384, + "narHash": "sha256-xnJJk+ct+D2+wdRxj1wk36w5zV9RVESwRqcklPdt3fM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", "type": "github" }, "original": { @@ -293,6 +309,7 @@ "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", @@ -309,11 +326,11 @@ ] }, "locked": { - "lastModified": 1781943681, - "narHash": "sha256-NFHmA7H47adqiyp+0iEOyZOQhmigDqA/NBAlf4imB6U=", + "lastModified": 1783174389, + "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "420f8d2e9882911f65cfac15cc706f639ba96cca", + "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b42ddd1..363b644 100644 --- a/flake.nix +++ b/flake.nix @@ -9,6 +9,7 @@ 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 diff --git a/modules/essentials/settings.nix b/modules/essentials/settings.nix index 069676f..3a1b406 100644 --- a/modules/essentials/settings.nix +++ b/modules/essentials/settings.nix @@ -27,7 +27,7 @@ # "https://nixos.snix.store" # https://nixos.snix.store/ ]; trusted-public-keys = [ - "cache.local:be5jFLkiwNyOep/McxSafB3jguBmztxx+oJ46ySyc/s=" + "nix-cache.home.arpa:be5jFLkiwNyOep/McxSafB3jguBmztxx+oJ46ySyc/s=" "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs=" ]; stalled-download-timeout = 8; diff --git a/modules/server/bentopdf.nix b/modules/server/bentopdf.nix index 852d3f4..7c8bc1f 100644 --- a/modules/server/bentopdf.nix +++ b/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; diff --git a/modules/server/calibre-web.nix b/modules/server/calibre-web.nix index e80bbfc..d74b45a 100644 --- a/modules/server/calibre-web.nix +++ b/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" + # ]; + # }; }; } diff --git a/modules/server/coredns.nix b/modules/server/coredns.nix index a8312b4..1266dcb 100644 --- a/modules/server/coredns.nix +++ b/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 } diff --git a/modules/server/default.nix b/modules/server/default.nix index 8cc8c34..d5ec7d5 100644 --- a/modules/server/default.nix +++ b/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 diff --git a/modules/server/nextcloud.nix b/modules/server/nextcloud.nix index 1599a60..57bf687 100644 --- a/modules/server/nextcloud.nix +++ b/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; diff --git a/modules/server/nginx.nix b/modules/server/nginx.nix index 5fb20b1..776c584 100644 --- a/modules/server/nginx.nix +++ b/modules/server/nginx.nix @@ -57,7 +57,7 @@ in } { addr = "127.0.0.1"; - port = 10000; + port = 8446; } ]; extraConfig = '' diff --git a/modules/server/nix-serve.nix b/modules/server/nix-serve.nix index 56bc86a..7ec7161 100644 --- a/modules/server/nix-serve.nix +++ b/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"; diff --git a/modules/server/stirling-pdf.nix b/modules/server/stirling-pdf.nix deleted file mode 100644 index e70ee7c..0000000 --- a/modules/server/stirling-pdf.nix +++ /dev/null @@ -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; - }; - }; -} diff --git a/modules/wsl/default.nix b/modules/wsl/default.nix index e2a624d..7e281aa 100644 --- a/modules/wsl/default.nix +++ b/modules/wsl/default.nix @@ -10,6 +10,7 @@ ../software/beets ../software/whisper.nix ./containers + ./nix-serve.nix ./tools #../server/open-webui.nix #../services/tts.nix diff --git a/modules/wsl/nix-serve.nix b/modules/wsl/nix-serve.nix new file mode 100644 index 0000000..7ec7161 --- /dev/null +++ b/modules/wsl/nix-serve.nix @@ -0,0 +1,25 @@ +{ + 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"; + }; + }; +} diff --git a/modules/wsl/secrets/nix-serve.yaml b/modules/wsl/secrets/nix-serve.yaml new file mode 100644 index 0000000..ada8bf3 --- /dev/null +++ b/modules/wsl/secrets/nix-serve.yaml @@ -0,0 +1,16 @@ +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