From 2846d5230a3c3923618eabb367deaf8885df580f Mon Sep 17 00:00:00 2001
From: zorrobert <118135271+zorrobert@users.noreply.github.com>
Date: Thu, 4 Apr 2024 21:49:02 +0200
Subject: [PATCH] joplin-desktop: allow undefined options

This PR fixes two issues that cause rebuild to fail, see #5222.

The first was caused when sync.target and sync.interval were not set,
this was fixed by changing the default values from null to "undefined"
and filtering these out later.

The second error occurred when the .config/joplin-desktop directory
didn't exist (e.g. when installing Joplin for the first time) which
caused the touch command to fail. This was fixed using mkdir to ensure
that .config/joplin-desktop exists.
---
 modules/programs/joplin-desktop.nix | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/modules/programs/joplin-desktop.nix b/modules/programs/joplin-desktop.nix
index bbf9e400d..418abff33 100644
--- a/modules/programs/joplin-desktop.nix
+++ b/modules/programs/joplin-desktop.nix
@@ -49,7 +49,7 @@ in {
     sync = {
       target = lib.mkOption {
         type = lib.types.enum [
-          null
+          "undefined"
           "none"
           "file-system"
           "onedrive"
@@ -60,15 +60,23 @@ in {
           "joplin-server"
           "joplin-cloud"
         ];
-        default = null;
+        default = "undefined";
         example = "dropbox";
         description = "What is the type of sync target.";
       };
 
       interval = lib.mkOption {
-        type =
-          lib.types.enum [ null "disabled" "5m" "10m" "30m" "1h" "12h" "1d" ];
-        default = null;
+        type = lib.types.enum [
+          "undefined"
+          "disabled"
+          "5m"
+          "10m"
+          "30m"
+          "1h"
+          "12h"
+          "1d"
+        ];
+        default = "undefined";
         example = "10m";
         description = ''
           Set the synchronisation interval.
@@ -90,6 +98,7 @@ in {
             "editor" = cfg.general.editor;
 
             "sync.target" = {
+              "undefined" = null;
               "none" = 0;
               "file-system" = 2;
               "onedrive" = 3;
@@ -99,9 +108,10 @@ in {
               "s3" = 8;
               "joplin-server" = 9;
               "joplin-cloud" = 10;
-            }.${cfg.sync.target} or null;
+            }.${cfg.sync.target};
 
             "sync.interval" = {
+              "undefined" = null;
               "disabled" = 0;
               "5m" = 300;
               "10m" = 600;
@@ -109,10 +119,11 @@ in {
               "1h" = 3600;
               "12h" = 43200;
               "1d" = 86400;
-            }.${cfg.sync.interval} or null;
+            }.${cfg.sync.interval};
           } // cfg.extraConfig));
       in lib.hm.dag.entryAfter [ "linkGeneration" ] ''
         # Ensure that settings.json exists.
+        mkdir -p ${builtins.dirOf configPath}
         touch ${configPath}
         # Config has to be written to temporary variable because jq cannot edit files in place.
         config="$(jq -s '.[0] + .[1]' ${configPath} ${newConfig})"