From 924e4114178af334c04d28ab155d75e432d18ed2 Mon Sep 17 00:00:00 2001
From: Ophestra <cat@gensokyo.uk>
Date: Sun, 28 Dec 2025 09:41:13 +0900
Subject: [PATCH] nix: set x-systemd options directly

NixOS generates two x-systemd.requires-mounts-for options for some reason, and there seems to be no knob for configuring ordering.

Signed-off-by: Ophestra <cat@gensokyo.uk>
---
 nixos.nix | 46 +++++++++++++++++++++++++++-------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/nixos.nix b/nixos.nix
index 800c81e..1a6098e 100644
--- a/nixos.nix
+++ b/nixos.nix
@@ -25,26 +25,34 @@ let
   getsubname = userid: appid: "u${toString userid}_a${toString appid}";
   getsubhome = userid: appid: "${cfg.stateDir}/u${toString userid}/a${toString appid}";
 
-  mountpoints = {
-    ${cfg.sharefs.name} = mkIf (cfg.sharefs.source != null) {
-      depends = [ cfg.sharefs.source ];
-      device = "sharefs";
-      fsType = "fuse.sharefs";
-      noCheck = true;
-      options = [
-        "rw"
-        "noexec"
-        "nosuid"
-        "nodev"
-        "noatime"
-        "allow_other"
-        "mkdir"
-        "source=${cfg.sharefs.source}"
-        "setuid=${toString config.users.users.${cfg.sharefs.user}.uid}"
-        "setgid=${toString config.users.groups.${cfg.sharefs.group}.gid}"
-      ];
+  mountpoints =
+    let
+      after = "sys-module-fuse.device";
+      before = "nix-daemon.socket";
+    in
+    {
+      ${cfg.sharefs.name} = mkIf (cfg.sharefs.source != null) {
+        device = "sharefs";
+        fsType = "fuse.sharefs";
+        options = [
+          "rw"
+          "noexec"
+          "nosuid"
+          "nodev"
+          "noatime"
+          "allow_other"
+          "mkdir"
+          "source=${cfg.sharefs.source}"
+          "setuid=${toString config.users.users.${cfg.sharefs.user}.uid}"
+          "setgid=${toString config.users.groups.${cfg.sharefs.group}.gid}"
+
+          "x-systemd.requires=${after}"
+          "x-systemd.before=${before}"
+          "x-systemd.required-by=${before}"
+          "x-systemd.requires-mounts-for=${cfg.sharefs.source}"
+        ];
+      };
     };
-  };
 in
 
 {