Fix Ferdium setting download folder correctly based on user

This commit is contained in:
Evie Litherland-Smith 2024-08-30 13:22:56 +01:00
parent 5ff572a9b7
commit 5519aecd71
2 changed files with 13 additions and 13 deletions

View file

@ -1,6 +1,10 @@
{ accentColor, progressbarAccentColor }:
{ {
inherit accentColor progressbarAccentColor; downloadFolderPath,
accentColor,
progressbarAccentColor,
}:
{
inherit downloadFolderPath accentColor progressbarAccentColor;
adaptableDarkMode = true; adaptableDarkMode = true;
alwaysShowWorkspaces = false; alwaysShowWorkspaces = false;
autoLaunchInBackground = false; autoLaunchInBackground = false;
@ -13,7 +17,6 @@
confirmOnQuit = false; confirmOnQuit = false;
customTodoServer = ""; customTodoServer = "";
darkMode = false; darkMode = false;
downloadFolderPath = "/home/pixelifytica/Downloads";
enableGPUAcceleration = true; enableGPUAcceleration = true;
enableGlobalHideShortcut = false; enableGlobalHideShortcut = false;
enableLongPressServiceHint = false; enableLongPressServiceHint = false;
@ -68,7 +71,7 @@
spellcheckerLanguage = "en-GB"; spellcheckerLanguage = "en-GB";
splitColumns = 3; splitColumns = 3;
splitMode = false; splitMode = false;
startMinimized = true; startMinimized = false;
translatorEngine = "LibreTranslate"; translatorEngine = "LibreTranslate";
translatorLanguage = "en"; translatorLanguage = "en";
twoFactorAutoCatcherMatcher = "token, code, sms, verify"; twoFactorAutoCatcherMatcher = "token, code, sms, verify";

View file

@ -64,16 +64,13 @@
configFile = { configFile = {
"autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop"; "autostart/signal-desktop.desktop".source = "${pkgs.signal-desktop}/share/applications/signal-desktop.desktop";
"autostart/ferdium.desktop".source = "${pkgs.ferdium}/share/applications/ferdium.desktop"; "autostart/ferdium.desktop".source = "${pkgs.ferdium}/share/applications/ferdium.desktop";
"Ferdium/config/settings.json".text = "Ferdium/config/settings.json".text = builtins.toJSON (
let import ./config/ferdium.nix {
downloadFolderPath = config.xdg.userDirs.download;
accentColor = config.scheme.withHashtag.${accentColourName}; accentColor = config.scheme.withHashtag.${accentColourName};
in progressbarAccentColor = config.scheme.withHashtag.${accentColourName};
builtins.toJSON ( }
import ./config/ferdium.nix { );
inherit accentColor;
progressbarAccentColor = accentColor;
}
);
"teams-for-linux/config.json".text = builtins.toJSON (import ./config/teams-for-linux.nix); "teams-for-linux/config.json".text = builtins.toJSON (import ./config/teams-for-linux.nix);
}; };
}; };