From 78c89e7f155d42a1dbf9ad7558a16a031e5dbdc9 Mon Sep 17 00:00:00 2001
From: servius <servius@darksailor.dev>
Date: Mon, 23 Mar 2026 20:48:38 +0530
Subject: [PATCH] feat: Moved calibre to ryu

---
 home/apps/bitwarden.nix         |  2 +-
 home/apps/calibre.nix           |  9 +----
 nixos/ryu/services/calibre.nix  | 43 ++++++++++++++++++++
 nixos/ryu/services/default.nix  |  1 +
 nixos/tako/services/calibre.nix | 69 ---------------------------------
 nixos/tako/services/default.nix |  3 +-
 6 files changed, 48 insertions(+), 79 deletions(-)
 create mode 100644 nixos/ryu/services/calibre.nix
 delete mode 100644 nixos/tako/services/calibre.nix

diff --git a/home/apps/bitwarden.nix b/home/apps/bitwarden.nix
index dc67158..b5f6aae 100644
--- a/home/apps/bitwarden.nix
+++ b/home/apps/bitwarden.nix
@@ -4,6 +4,6 @@
   ...
 }: {
   home.packages = lib.optionals pkgs.stdenv.isLinux [
-    pkgs.bitwarden-desktop
+    # pkgs.bitwarden-desktop
   ];
 }
diff --git a/home/apps/calibre.nix b/home/apps/calibre.nix
index fb4116d..4616241 100644
--- a/home/apps/calibre.nix
+++ b/home/apps/calibre.nix
@@ -1,8 +1,3 @@
-{
-  pkgs,
-  device,
-  lib,
-  ...
-}: {
-  home.packages = lib.optionals (device.is "ryu") [pkgs.calibre];
+{device, ...}: {
+  programs.calibre.enable = device.is "ryu";
 }
diff --git a/nixos/ryu/services/calibre.nix b/nixos/ryu/services/calibre.nix
new file mode 100644
index 0000000..34a05fa
--- /dev/null
+++ b/nixos/ryu/services/calibre.nix
@@ -0,0 +1,43 @@
+{
+  pkgs,
+  device,
+  config,
+  ...
+}: let
+  port = 8134;
+  user = config.services.calibre-web.user or "calibre-web";
+  group = config.services.calibre-web.group or "calibre-web";
+in {
+  services = {
+    calibre-web = {
+      enable = true;
+      listen = {
+        ip = "127.0.0.1";
+        inherit port;
+      };
+      options = {
+        calibreLibrary = "/home/servius/Books";
+        enableBookConversion = true;
+        # reverseProxyAuth = {
+        #   enable = true;
+        #   header = "Remote-User";
+        # };
+      };
+    };
+    caddy = {
+      virtualHosts."books.darksailor.dev".extraConfig = ''
+        reverse_proxy localhost:${toString port}
+      '';
+    };
+  };
+
+  users.users.${device.user} = {
+    extraGroups = [group];
+  };
+  users.users.${user} = {
+    extraGroups = [device.user];
+  };
+  users.users.caddy = {
+    extraGroups = [group];
+  };
+}
diff --git a/nixos/ryu/services/default.nix b/nixos/ryu/services/default.nix
index bf47bfd..0b44a70 100644
--- a/nixos/ryu/services/default.nix
+++ b/nixos/ryu/services/default.nix
@@ -4,6 +4,7 @@
     # ./zerotier.nix
     # ./dnscrypt.nix
     ./caddy.nix
+    ./calibre.nix
     ./dualsense.nix
     ./fprintd.nix
     ./fwupd.nix
diff --git a/nixos/tako/services/calibre.nix b/nixos/tako/services/calibre.nix
deleted file mode 100644
index c1bc016..0000000
--- a/nixos/tako/services/calibre.nix
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  pkgs,
-  device,
-  config,
-  ...
-}: let
-  port = 8134;
-  user = config.services.calibre-web.user or "calibre-web";
-  group = config.services.calibre-web.group or "calibre-web";
-in {
-  services = {
-    calibre-web = {
-      enable = true;
-      listen = {
-        ip = "127.0.0.1";
-        inherit port;
-      };
-      options = {
-        calibreLibrary = "/media/books";
-        enableBookConversion = true;
-        reverseProxyAuth = {
-          enable = true;
-          header = "Remote-User";
-        };
-      };
-    };
-    caddy = {
-      virtualHosts."books.darksailor.dev".extraConfig = ''
-        import auth
-        reverse_proxy localhost:${toString port}
-      '';
-    };
-    authelia = {
-      instances.darksailor = {
-        settings = {
-          access_control = {
-            rules = [
-              {
-                domain = "books.darksailor.dev";
-                policy = "one_factor";
-              }
-            ];
-          };
-        };
-      };
-    };
-  };
-  systemd.services.calibre-web.path = [pkgs.python311Packages.python-ldap];
-  systemd.tmpfiles.settings = {
-    calibreBookDirs = {
-      "/media/books".d = {
-        mode = "775";
-        inherit user group;
-      };
-    };
-    calibreWebDirs = {
-      "/run/calibre-web".d = {
-        mode = "775";
-        inherit user group;
-      };
-    };
-  };
-  users.users.${device.user} = {
-    extraGroups = [group];
-  };
-  users.users.caddy = {
-    extraGroups = [group];
-  };
-}
diff --git a/nixos/tako/services/default.nix b/nixos/tako/services/default.nix
index 11ffe05..451b150 100644
--- a/nixos/tako/services/default.nix
+++ b/nixos/tako/services/default.nix
@@ -2,9 +2,8 @@
   imports = [
     ./atuin.nix
     ./authelia.nix
-    ./kobo.nix
+    # ./kobo.nix
     ./caddy.nix
-    # ./calibre.nix
     ./fail2ban.nix
     ./homepage.nix
     ./lldap.nix
-- 
2.51.2