From 5519aecd71fe37a23118ba58b8b30ee93d62898e Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie@xenia.me.uk>
Date: Fri, 30 Aug 2024 13:22:56 +0100
Subject: [PATCH] Fix Ferdium setting download folder correctly based on user

---
 system/home/config/ferdium.nix | 11 +++++++----
 system/home/desktop.nix        | 15 ++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/home/config/ferdium.nix b/system/home/config/ferdium.nix
index e4c72814..e9bfde4d 100644
--- a/system/home/config/ferdium.nix
+++ b/system/home/config/ferdium.nix
@@ -1,6 +1,10 @@
-{ accentColor, progressbarAccentColor }:
 {
-  inherit accentColor progressbarAccentColor;
+  downloadFolderPath,
+  accentColor,
+  progressbarAccentColor,
+}:
+{
+  inherit downloadFolderPath accentColor progressbarAccentColor;
   adaptableDarkMode = true;
   alwaysShowWorkspaces = false;
   autoLaunchInBackground = false;
@@ -13,7 +17,6 @@
   confirmOnQuit = false;
   customTodoServer = "";
   darkMode = false;
-  downloadFolderPath = "/home/pixelifytica/Downloads";
   enableGPUAcceleration = true;
   enableGlobalHideShortcut = false;
   enableLongPressServiceHint = false;
@@ -68,7 +71,7 @@
   spellcheckerLanguage = "en-GB";
   splitColumns = 3;
   splitMode = false;
-  startMinimized = true;
+  startMinimized = false;
   translatorEngine = "LibreTranslate";
   translatorLanguage = "en";
   twoFactorAutoCatcherMatcher = "token, code, sms, verify";
diff --git a/system/home/desktop.nix b/system/home/desktop.nix
index 6d0674b8..09750ec6 100644
--- a/system/home/desktop.nix
+++ b/system/home/desktop.nix
@@ -64,16 +64,13 @@
     configFile = {
       "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
       "autostart/ferdium.desktop".source = "${pkgs.ferdium}/share/applications/ferdium.desktop";
-      "Ferdium/config/settings.json".text =
-        let
+      "Ferdium/config/settings.json".text = builtins.toJSON (
+        import ./config/ferdium.nix {
+          downloadFolderPath = config.xdg.userDirs.download;
           accentColor = config.scheme.withHashtag.${accentColourName};
-        in
-        builtins.toJSON (
-          import ./config/ferdium.nix {
-            inherit accentColor;
-            progressbarAccentColor = accentColor;
-          }
-        );
+          progressbarAccentColor = config.scheme.withHashtag.${accentColourName};
+        }
+      );
       "teams-for-linux/config.json".text = builtins.toJSON (import ./config/teams-for-linux.nix);
     };
   };