From f58a36dedf161a0bdb121d9c4e058cf545127fae Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Wed, 4 Sep 2024 15:34:45 +0200
Subject: [PATCH] Make it easier to add additional mount options

When using the `default` attribute of `mkOption`, the default value is
assigned with a very low priority and is overwritten by any other
assignment to the same option.
For the mount options, this will rarely be the desired behaviour, and
users will need to remember to add the default mount options themselves
when setting any additional mount options.

In this case, I think it's better to assign the default value with the
normal priority so that any additional assignments are simply added.
If a user really wants to overwrite the default options, they can use
`mkForce`.
---
 options.nix | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/options.nix b/options.nix
index 00e3c33..ccfd020 100644
--- a/options.nix
+++ b/options.nix
@@ -107,13 +107,12 @@ let
         };
         mountOptions = lib.mkOption {
           type = with lib.types; listOf (coercedTo str (n: { name = n; }) mountOption);
-          default = [
-            "bind"
-            "X-fstrim.notrim" # see fstrim(8)
-          ];
           description = ''
             Specify a list of mount options that should be used for this directory.
             These options are only used when {option}`how` is set to `bindmount`.
+            By default, `bind` and `X-fstrim.notrim` are added,
+            use `mkForce` to override these if needed.
+            See also {manpage}`fstrim(8)`.
           '';
         };
         createLinkTarget = lib.mkOption {
@@ -143,6 +142,13 @@ let
           '';
         };
       };
+
+      config = {
+        mountOptions = [
+          "bind"
+          "X-fstrim.notrim" # see fstrim(8)
+        ];
+      };
     };
 
   filePath =
@@ -239,10 +245,11 @@ let
         };
         mountOptions = lib.mkOption {
           type = with lib.types; listOf (coercedTo str (o: { name = o; }) mountOption);
-          default = [ "bind" ];
           description = ''
             Specify a list of mount options that should be used for this file.
             These options are only used when {option}`how` is set to `bindmount`.
+            By default, `bind` is added,
+            use `mkForce` to override this if needed.
           '';
         };
         createLinkTarget = lib.mkOption {
@@ -275,6 +282,12 @@ let
           '';
         };
       };
+
+      config = {
+        mountOptions = [
+          "bind"
+        ];
+      };
     };
 
   userModule =