From b6575a03f7f76999ecc1558132999fe326d47ae6 Mon Sep 17 00:00:00 2001 From: servius Date: Mon, 23 Mar 2026 22:11:14 +0530 Subject: [PATCH] feat: Disabled calibre for ryu --- nixos/ryu/configuration.nix | 6 ++++++ nixos/ryu/ryu.nix | 6 ++++++ nixos/ryu/services/calibre.nix | 25 +++++++++++-------------- nixos/ryu/services/default.nix | 9 +++++---- nixos/tako/services/default.nix | 2 +- 5 files changed, 29 insertions(+), 19 deletions(-) diff --git a/nixos/ryu/configuration.nix b/nixos/ryu/configuration.nix index 1bf28e3..f1f5a72 100644 --- a/nixos/ryu/configuration.nix +++ b/nixos/ryu/configuration.nix @@ -72,7 +72,13 @@ ]; }; users.groups.i2c = {}; + users.users.media = { + isSystemUser = true; + extraGroups = ["audio" "video"]; + group = "media"; + }; users.groups.media = {}; + users.groups.${device.user} = { gid = device.gid; members = [device.user]; diff --git a/nixos/ryu/ryu.nix b/nixos/ryu/ryu.nix index dcaf4f2..ef1e645 100644 --- a/nixos/ryu/ryu.nix +++ b/nixos/ryu/ryu.nix @@ -130,6 +130,12 @@ options = ["nofail"]; }; + fileSystems."/volumes/media" = { + device = "/dev/storage/media"; + fsType = "ext4"; + options = ["nofail"]; + }; + fileSystems."/var" = { device = "/dev/disk/by-uuid/ff874913-dc21-43f3-82f8-cdf45dd888f7"; fsType = "ext4"; diff --git a/nixos/ryu/services/calibre.nix b/nixos/ryu/services/calibre.nix index 34a05fa..cb0c8b8 100644 --- a/nixos/ryu/services/calibre.nix +++ b/nixos/ryu/services/calibre.nix @@ -4,7 +4,7 @@ config, ... }: let - port = 8134; + port = 8293; user = config.services.calibre-web.user or "calibre-web"; group = config.services.calibre-web.group or "calibre-web"; in { @@ -16,7 +16,7 @@ in { inherit port; }; options = { - calibreLibrary = "/home/servius/Books"; + calibreLibrary = "/volumes/media/Books"; enableBookConversion = true; # reverseProxyAuth = { # enable = true; @@ -24,20 +24,17 @@ in { # }; }; }; - caddy = { - virtualHosts."books.darksailor.dev".extraConfig = '' - reverse_proxy localhost:${toString port} - ''; - }; + # caddy = { + # virtualHosts."books.darksailor.dev".extraConfig = '' + # reverse_proxy localhost:${toString port} + # ''; + # }; }; - - users.users.${device.user} = { - extraGroups = [group]; + systemd.services.calibre-web = { + path = [pkgs.python-jsonschema]; }; + users.users.${user} = { - extraGroups = [device.user]; - }; - users.users.caddy = { - extraGroups = [group]; + extraGroups = ["media"]; }; } diff --git a/nixos/ryu/services/default.nix b/nixos/ryu/services/default.nix index 0b44a70..918e3fe 100644 --- a/nixos/ryu/services/default.nix +++ b/nixos/ryu/services/default.nix @@ -1,10 +1,12 @@ {...}: { imports = [ + # ./calibre.nix + # ./dnscrypt.nix # ./rsyncd.nix + # ./sunshine.nix # ./zerotier.nix - # ./dnscrypt.nix + ./caddy.nix - ./calibre.nix ./dualsense.nix ./fprintd.nix ./fwupd.nix @@ -16,12 +18,11 @@ ./ollama.nix ./openrgb.nix ./openssh.nix + ./pipewire.nix ./resolved.nix ./samba.nix ./sshd.nix - # ./sunshine.nix ./tailscale.nix ./wivrn.nix - ./pipewire.nix ]; } diff --git a/nixos/tako/services/default.nix b/nixos/tako/services/default.nix index 451b150..9dfe112 100644 --- a/nixos/tako/services/default.nix +++ b/nixos/tako/services/default.nix @@ -2,7 +2,7 @@ imports = [ ./atuin.nix ./authelia.nix - # ./kobo.nix + ./kobo.nix ./caddy.nix ./fail2ban.nix ./homepage.nix -- 2.51.2