From f18358e283080b62473208e78dcfa51c3a91bac6 Mon Sep 17 00:00:00 2001 From: oqyude Date: Sat, 25 Oct 2025 12:33:54 +0300 Subject: [PATCH] 123 --- flake.nix | 2 +- modules/server/calibre-web.nix | 6 +++--- modules/server/immich.nix | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.nix b/flake.nix index 65442e2..f14b51a 100755 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ # nixpkgs nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-last-unstable.url = "github:NixOS/nixpkgs/6b4955211758ba47fac850c040a27f23b9b4008f"; - calibre.url = "github:NixOS/nixpkgs/35f590344ff791e6b1d6d6b8f3523467c9217caf"; + nixpkgs-calibre.url = "github:NixOS/nixpkgs/35f590344ff791e6b1d6d6b8f3523467c9217caf"; #nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; nixpkgs-master.url = "github:NixOS/nixpkgs/master"; # e63467437ce61d8d9a36e09254e8d07b472da0c6 # 72353fc1fa61189fb76133d50c519e871c858c39 # 5b38c7435fb1112a8b36b1652286996a7998c5b5 nixpkgs-stable.url = "github:NixOS/nixpkgs/nixos-25.05"; diff --git a/modules/server/calibre-web.nix b/modules/server/calibre-web.nix index 823bcf8..721bfc2 100644 --- a/modules/server/calibre-web.nix +++ b/modules/server/calibre-web.nix @@ -5,15 +5,15 @@ ... }: let - fix = import inputs.nixpkgs-master { + stable = import inputs.nixpkgs-calibre { system = "x86_64-linux"; }; # temp in { - # services.calibre-server.package = fix.calibre; + services.calibre-server.package = stable.calibre; services.calibre-web = { enable = true; - # package = fix.calibre-web; + package = stable.calibre-web; group = "users"; user = "${xlib.device.username}"; options = { diff --git a/modules/server/immich.nix b/modules/server/immich.nix index 4f626a4..4052af4 100644 --- a/modules/server/immich.nix +++ b/modules/server/immich.nix @@ -6,11 +6,11 @@ xlib, ... }: -let - master = import inputs.nixpkgs-master { - system = "x86_64-linux"; - }; -in +# let +# master = import inputs.nixpkgs-master { +# system = "x86_64-linux"; +# }; +# in { services = { immich = {