From d578b5df71f30d94d112ed63a043f33adc4eee04 Mon Sep 17 00:00:00 2001
From: Kopatz <7265381+Kropatz@users.noreply.github.com>
Date: Mon, 15 Apr 2024 12:26:45 +0200
Subject: [PATCH] fix kavita

---
 flake.lock                     | 17 +++++++++++++++++
 flake.nix                      |  4 +++-
 modules/collections/server.nix |  2 +-
 modules/services/kavita.nix    |  3 ++-
 overlays.nix                   |  7 +++++++
 5 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 8b7b5f0..01e328e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -229,6 +229,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-fixed-kavita": {
+      "locked": {
+        "lastModified": 1711893330,
+        "narHash": "sha256-XUZvnZGGptiAtUhxAjnCDjF6Ov6D0/Ag61L+sPyjVHA=",
+        "owner": "davidkna",
+        "repo": "nixpkgs",
+        "rev": "9c2c6f35de1ed1e18467cf224ed86689e6f589c4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "davidkna",
+        "ref": "kavita-fix-migrations",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs-lib": {
       "locked": {
         "lastModified": 1697935651,
@@ -299,6 +315,7 @@
         "nixos-hardware": "nixos-hardware",
         "nixos-wsl": "nixos-wsl",
         "nixpkgs": "nixpkgs_2",
+        "nixpkgs-fixed-kavita": "nixpkgs-fixed-kavita",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "nur": "nur"
       }
diff --git a/flake.nix b/flake.nix
index 07f1914..99aef6f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,7 @@
       nixpkgs.url = "github:nixos/nixpkgs/nixos-23.11";
       nixos-hardware.url = "github:NixOS/nixos-hardware/master";
       nixpkgs-unstable.url = "nixpkgs/nixos-unstable";
+      nixpkgs-fixed-kavita.url = "github:davidkna/nixpkgs/kavita-fix-migrations";
       home-manager = {
         url = "github:nix-community/home-manager/release-23.11";
         inputs.nixpkgs.follows = "nixpkgs";
@@ -27,6 +28,7 @@
               nixos-hardware,
               nixos-wsl,
               nixpkgs-unstable,
+              nixpkgs-fixed-kavita,
               agenix,
               home-manager,
               home-manager-unstable,
@@ -44,7 +46,7 @@
         ./users/anon
         ./modules/collections/server.nix
         ./systems/server/configuration.nix
-        ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages]; })
+        ({ config, outputs, ... }: { nixpkgs.overlays = with outputs.overlays; [additions modifications unstable-packages fixed-kavita]; })
         home-manager-unstable.nixosModules.home-manager
         agenix.nixosModules.default
       ];
diff --git a/modules/collections/server.nix b/modules/collections/server.nix
index 1d9e725..f6d6a90 100644
--- a/modules/collections/server.nix
+++ b/modules/collections/server.nix
@@ -7,7 +7,7 @@
     ../services/github-runner.nix
     ../services/gitolite.nix
     # wait for https://github.com/NixOS/nixpkgs/pull/300228
-    #../services/kavita.nix
+    ../services/kavita.nix
     ../services/grafana.nix
     #../services/nextcloud.nix
     ../services/nginx.nix
diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix
index 4100a04..44b1b04 100644
--- a/modules/services/kavita.nix
+++ b/modules/services/kavita.nix
@@ -18,8 +18,9 @@ in
   };
 
  services.kavita = {
-    enable = false;
+    enable = true;
     user = "kavita";
+    package = pkgs.fixed-kavita.kavita;
     settings.Port = 5000;
     dataDir = baseDir;
     tokenKeyFile = config.age.secrets.kavita.path;
diff --git a/overlays.nix b/overlays.nix
index 99f666c..99529af 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -20,4 +20,11 @@
       config.allowUnfree = true;
     };
   };
+  
+  fixed-kavita = final: _prev: {
+    fixed-kavita = import inputs.nixpkgs-fixed-kavita {
+      system = final.system;
+      config.allowUnfree = true;
+    };
+  };
 }