From e157bc90cd8820a820b7c9a08140f8087fcda7d2 Mon Sep 17 00:00:00 2001
From: nydragon <contact@ccnlc.eu>
Date: Wed, 19 Mar 2025 17:11:42 +0100
Subject: [PATCH] feat: package and declaratively set calibre plugins

---
 flake.lock               | 50 +++++++++++++++++++++++++++++++++-------
 flake.nix                |  2 ++
 home/themes/vanilla.nix  |  2 +-
 modules/nix/overlays.nix | 16 -------------
 users/ny/default.nix     |  6 +++++
 5 files changed, 51 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index 6e7605f..8e54ef4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -23,6 +23,24 @@
         "type": "github"
       }
     },
+    "calibre-plugins": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_2"
+      },
+      "locked": {
+        "lastModified": 1742395204,
+        "narHash": "sha256-RhI3wa1OCIjpkgwI8FEt1n3DlDP6w9W4jA+E3h6KdZU=",
+        "ref": "refs/heads/main",
+        "rev": "a131835a6016b8538d4e66e79eeb6393f436ee8c",
+        "revCount": 6,
+        "type": "git",
+        "url": "https://git.ccnlc.eu/nydragon/calibre-plugins.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.ccnlc.eu/nydragon/calibre-plugins.git"
+      }
+    },
     "darwin": {
       "inputs": {
         "nixpkgs": [
@@ -265,11 +283,26 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1742069588,
-        "narHash": "sha256-C7jVfohcGzdZRF6DO+ybyG/sqpo1h6bZi9T56sxLy+k=",
+        "lastModified": 1742335908,
+        "narHash": "sha256-unmSiGsXmUAZ4fAcSgf1iwssLmt/FLrczhLAsosyLh8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c80f6a7e10b39afcc1894e02ef785b1ad0b0d7e5",
+        "rev": "fb9a9ddebc6c9685d2b6b98b35f134573e1872c8",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1742288794,
+        "narHash": "sha256-Txwa5uO+qpQXrNG4eumPSD+hHzzYi/CdaM80M9XRLCo=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "b6eaf97c6960d97350c584de1b6dcff03c9daf42",
         "type": "github"
       },
       "original": {
@@ -279,7 +312,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_3": {
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1741462378,
         "narHash": "sha256-ZF3YOjq+vTcH51S+qWa1oGA9FgmdJ67nTNPG2OIlXDc=",
@@ -295,7 +328,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1741851582,
         "narHash": "sha256-cPfs8qMccim2RBgtKGF+x9IBCduRvd/N5F4nYpU0TVE=",
@@ -355,7 +388,7 @@
     },
     "quasigod": {
       "inputs": {
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "snowfall-lib": "snowfall-lib"
       },
       "locked": {
@@ -374,7 +407,7 @@
     },
     "quickshell": {
       "inputs": {
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1738200090,
@@ -393,13 +426,14 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "calibre-plugins": "calibre-plugins",
         "disko": "disko",
         "flake-parts": "flake-parts",
         "hjem": "hjem",
         "hjem-rum": "hjem-rum",
         "home-manager": "home-manager",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_2",
+        "nixpkgs": "nixpkgs_3",
         "nur": "nur",
         "nysh": "nysh",
         "wallpapers": "wallpapers"
diff --git a/flake.nix b/flake.nix
index fe3a500..83de59f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -47,6 +47,8 @@
     };
 
     wallpapers.url = "git+https://git.ccnlc.eu/nydragon/wallpapers.git";
+
+    calibre-plugins.url = "git+https://git.ccnlc.eu/nydragon/calibre-plugins.git";
   };
 
   outputs =
diff --git a/home/themes/vanilla.nix b/home/themes/vanilla.nix
index 99ca082..e5161ef 100644
--- a/home/themes/vanilla.nix
+++ b/home/themes/vanilla.nix
@@ -11,7 +11,7 @@ in
   gtk = {
     enable = true;
     theme = {
-      name = "Adwaita";
+      name = "Adwaita-dark";
       package = pkgs.gnome-themes-extra;
     };
     iconTheme = rec {
diff --git a/modules/nix/overlays.nix b/modules/nix/overlays.nix
index 200e206..e2ecb8f 100644
--- a/modules/nix/overlays.nix
+++ b/modules/nix/overlays.nix
@@ -1,5 +1,4 @@
 {
-  inputs,
   inputs',
   config,
   lib,
@@ -8,21 +7,6 @@
 {
   nixpkgs.overlays = [
     (final: prev: {
-      # Add env vars to calibre so they may get propagated to a plugin that needs them
-      calibre = prev.calibre.overrideAttrs (old: {
-        postInstall = ''
-          wrapProgram $out/bin/calibre \
-              --set QT_QPA_PLATFORM xcb \
-              --set-default ACSM_LIBCRYPTO ${prev.openssl.out}/lib/libcrypto.so \
-              --set-default ACSM_LIBSSL ${prev.openssl.out}/lib/libssl.so
-        '';
-      });
-
-      lollypop = prev.lollypop.override {
-        #lastFMSupport = false;
-        youtubeSupport = false;
-      };
-
       scripts = import ../../home/scripts {
         inherit lib config;
         pkgs = prev.pkgs;
diff --git a/users/ny/default.nix b/users/ny/default.nix
index 8cea41e..0e1615d 100644
--- a/users/ny/default.nix
+++ b/users/ny/default.nix
@@ -7,6 +7,7 @@
 }:
 let
   inherit (config.modules.meta) username;
+  calibrePlugins = inputs'.calibre-plugins.packages;
 in
 {
   hjem = {
@@ -16,6 +17,11 @@ in
         ./programs
         ./misc
       ];
+
+      files = {
+        ".config/calibre/plugins/ACSM Input.zip".source = calibrePlugins.acsm-calibre-plugin;
+        ".config/calibre/plugins/DeDRM.zip".source = calibrePlugins.dedrm-plugin;
+      };
     };
     specialArgs = {
       libmy = lib.my;