From 63d8d1ceb9e5365540727617dd4a186411333db3 Mon Sep 17 00:00:00 2001
From: Nathan Anderson <n8r@tuta.io>
Date: Wed, 15 May 2024 10:22:30 -0600
Subject: [PATCH] Fix for radicale file

---
 luci/modules/home-manager/home.nix | 5 +++++
 shared/server-configuration.nix    | 7 +------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/luci/modules/home-manager/home.nix b/luci/modules/home-manager/home.nix
index 02a6d9d..f8817f5 100644
--- a/luci/modules/home-manager/home.nix
+++ b/luci/modules/home-manager/home.nix
@@ -44,6 +44,11 @@ in
     recursive = true;
   };
 
+  # Copy radicale pass file
+  home.file."${config.xdg}/radicale" = {
+    source = ../luci/modules/radicale/rad_pass;
+  };
+
   home.sessionVariables = {
     EDITOR = "hx";
   };
diff --git a/shared/server-configuration.nix b/shared/server-configuration.nix
index 41f710c..8e23f9e 100644
--- a/shared/server-configuration.nix
+++ b/shared/server-configuration.nix
@@ -159,16 +159,11 @@ in
       };
       auth = {
         type = "htpasswd";
-        htpasswd_filename = "${config.xdg.configHome}/radicale/rad_pass";
+        htpasswd_filename = "/home/luci/.config/radicale/rad_pass";
         htpasswd_encryption = "bcrypt";
       };
     };
 
-    # Copy radicale pass file
-    home.file."${config.xdg.configHome}/radicale" = lib.mkIf srvConfig.caldavEnable {
-      source = ../luci/modules/radicale/rad_pass;
-    };
-
     systemd.timers."pixel-backups" = {
       wantedBy = [ "timers.target" ];
         timerConfig = {