From cf9f2518a8ef7375ebca60b30d35b6fa87be305d Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Fri, 25 Apr 2025 12:27:40 +0200
Subject: [PATCH] removed seperatehist in favor of default settings attrset.

---
 contrib/nixos/modules/copyparty.nix | 26 ++++++++------------------
 1 file changed, 8 insertions(+), 18 deletions(-)

diff --git a/contrib/nixos/modules/copyparty.nix b/contrib/nixos/modules/copyparty.nix
index d3942da9..2173c925 100644
--- a/contrib/nixos/modules/copyparty.nix
+++ b/contrib/nixos/modules/copyparty.nix
@@ -105,16 +105,6 @@ in {
       description = "Number of files to allow copyparty to open.";
     };
 
-    separateHist = mkOption {
-      default = true;
-      type = types.bool;
-      description = ''
-        Whether to have cache directories separate from their associated volumes.
-
-        Disabling this can be useful if you want the served volume to be portable between machines, or otherwise self-contained.
-      '';
-    };
-
     settings = mkOption {
       type = types.attrs;
       description = ''
@@ -126,11 +116,13 @@ in {
       default = {
         i = "127.0.0.1";
         no-reload = true;
+        hist = externalCacheDir;
       };
       example = literalExpression ''
         {
           i = "0.0.0.0";
           no-reload = true;
+          hist = ${externalCacheDir};
         }
       '';
     };
@@ -270,8 +262,7 @@ in {
       serviceConfig = {
         Type = "simple";
         ExecStart = ''
-          ${getExe cfg.package} -c ${runtimeConfigPath} \
-          ${optionalString (cfg.separateHist) "--hist ${externalCacheDir}"}
+          ${getExe cfg.package} -c ${runtimeConfigPath}
         '';
 
         # Hardening options
@@ -281,8 +272,8 @@ in {
         RuntimeDirectoryMode = "0700";
         StateDirectory = ["copyparty"];
         StateDirectoryMode = "0700";
-        CacheDirectory = lib.mkIf cfg.separateHist ["copyparty"];
-        CacheDirectoryMode = lib.mkIf cfg.separateHist "0700";
+        CacheDirectory = lib.mkIf (cfg.settings ? hist) ["copyparty"];
+        CacheDirectoryMode = lib.mkIf (cfg.settings ? hist) "0700";
         WorkingDirectory = externalStateDir;
         BindReadOnlyPaths =
           [
@@ -295,8 +286,8 @@ in {
           ++ (mapAttrsToList (k: v: "-${v.passwordFile}") cfg.accounts);
         BindPaths =
           (
-            if cfg.separateHist
-            then [externalCacheDir]
+            if cfg.settings ? hist
+            then [cfg.hist]
             else []
           )
           ++ [externalStateDir]
@@ -348,7 +339,7 @@ in {
     users.users.copyparty = lib.mkIf (cfg.user == "copyparty" && cfg.group == "copyparty") {
       description = "Service user for copyparty";
       group = "copyparty";
-      home = lib.mkIf cfg.separateHist externalStateDir;
+      home = externalStateDir;
       isSystemUser = true;
     };
     environment.systemPackages = lib.mkIf cfg.mkHashWrapper [
@@ -356,7 +347,6 @@ in {
         let
           command = ''
             ${getExe cfg.package} -c ${runtimeConfigPath} \
-            ${optionalString (cfg.separateHist) "--hist ${externalCacheDir}"} \
             --shr-db ''' \
             --ses-db ''' \
             --ah-cli \