hopefully fix kavita sorting

modules/graphical/shared.nix

@@ -39,8 +39,6 @@ in
       ];
     };
   
-    # Allow unfree packages
-    nixpkgs.config.allowUnfree = true;
     services.xserver.wacom.enable = true;
   
     # List packages installed in system profile. To search, run:

modules/nix/settings.nix

@@ -13,6 +13,7 @@ in
     nix.settings.experimental-features = [ "nix-command" "flakes" ];
     nix.registry.nixpkgs.flake = pkgsVersion;
     nix.nixPath = ["nixpkgs=flake:nixpkgs"];
+    nixpkgs.config.allowUnfree = true;
     home-manager.users.${config.mainUser.name}.home.sessionVariables = {
       NIX_PATH = "nixpkgs=flake:nixpkgs$\{NIX_PATH:+:$NIX_PATH}";
       NIXPKGS_ALLOW_UNFREE = "1";

modules/services/default.nix

@@ -2,5 +2,6 @@
 {
   imports = [
     ./kubernetes.nix
+    ./kavita.nix
   ];
 }

modules/services/kavita.nix

@@ -1,17 +1,26 @@
 { config, pkgs, lib, inputs, ... }:
+with lib;
+let
+  cfg = config.custom.services.kavita;
+in
+{
+  options.custom.services.kavita = {
+      enable = mkEnableOption "Enables kavita";
+  };
+  config =
 let
   fqdn = "kavita-kopatz.duckdns.org";
   useStepCa = false; #config.services.step-ca.enable;
   useHttps = true;
   baseDir = "/mnt/1tbssd/kavita";
   mangal = "${pkgs.mangal}/bin/mangal";
-in
-{
+  githubRunnerEnabled = config.services.github-runners ? oberprofis.enable;
+in lib.mkIf cfg.enable {
   networking.firewall.allowedTCPPorts = [ 5000 ];
   systemd.tmpfiles.rules = [
-      (if config.services.github-runners.oberprofis.enable then "d ${baseDir} 0750 kavita github-actions-runner -" else "d ${baseDir} 0770 kavita kavita -")
+      (if githubRunnerEnabled then "d ${baseDir} 0750 kavita github-actions-runner -" else "d ${baseDir} 0770 kavita kavita -")
       "d ${baseDir}/manga 0770 kavita kavita -"
-  ] ++ lib.optional config.services.github-runners.oberprofis.enable "d ${baseDir}/github 0770 github-actions-runner kavita -";
+  ] ++ lib.optional githubRunnerEnabled "d ${baseDir}/github 0770 github-actions-runner kavita -";
 
   age.secrets.kavita = {
     file = ../../secrets/kavita.age;
@@ -22,7 +31,7 @@ in
  services.kavita = {
     enable = true;
     user = "kavita";
-    package = pkgs.kavita;
+    package = pkgs.myKavita;
     settings.Port = 5000;
     dataDir = baseDir;
     tokenKeyFile = config.age.secrets.kavita.path;
@@ -84,4 +93,5 @@ in
       add_header Access-Control-Allow-Headers "Authorization, Origin, X-Requested-With, Content-Type, Accept";
     '';
   };
+};
 }