From 935c80ef5a8c20a06086ab45db47864ab15808e8 Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Sun, 26 Jan 2025 20:30:11 +0800
Subject: [PATCH] fix: darwin - use XDG base directories, fix secrets

---
 flake.lock                                       | 6 +++---
 home/base/tui/editors/neovim/nvim/lazy-lock.json | 1 +
 home/darwin/default.nix                          | 3 +++
 modules/darwin/apps.nix                          | 3 +++
 secrets/darwin.nix                               | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index e37f31f7..45395aac 100644
--- a/flake.lock
+++ b/flake.lock
@@ -763,10 +763,10 @@
     "mysecrets": {
       "flake": false,
       "locked": {
-        "lastModified": 1732893968,
-        "narHash": "sha256-Bi0vjWt2S4PKfBToZNc8zUwlwZRUB5/OpDMC8k0hoig=",
+        "lastModified": 1737951151,
+        "narHash": "sha256-HwAOhqXAAmpwMtExiDglZEw4A6c1Y/wJRDnvQOQwDWk=",
         "ref": "refs/heads/main",
-        "rev": "0d2564a2feb4f6fcc9cb98a3410fe5531e409043",
+        "rev": "cdc5b9e272cb61e088f3194bd423f4759aae609d",
         "shallow": true,
         "type": "git",
         "url": "ssh://git@github.com/ryan4yin/nix-secrets.git"
diff --git a/home/base/tui/editors/neovim/nvim/lazy-lock.json b/home/base/tui/editors/neovim/nvim/lazy-lock.json
index 089ad628..981efffb 100644
--- a/home/base/tui/editors/neovim/nvim/lazy-lock.json
+++ b/home/base/tui/editors/neovim/nvim/lazy-lock.json
@@ -22,6 +22,7 @@
   "cmp-tailwind-colors": { "branch": "main", "commit": "4b200e280e9051a26ade776589c2ac246350f5dc" },
   "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
   "conjure": { "branch": "main", "commit": "9197941c0ef05bd594bf8fbcc907129361ed456f" },
+  "copilot.lua": { "branch": "fix_issue_330", "commit": "538ed7e66cb07186e8083da42e5b3c9752897d72" },
   "crates.nvim": { "branch": "main", "commit": "bd35b13e94a292ee6e32c351e05ca2202dc9f070" },
   "deno-nvim": { "branch": "master", "commit": "4bc9b5db13e8152b01aed51ce0451cdd38ca6743" },
   "dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
diff --git a/home/darwin/default.nix b/home/darwin/default.nix
index 39d89108..7a890430 100644
--- a/home/darwin/default.nix
+++ b/home/darwin/default.nix
@@ -12,4 +12,7 @@
       ../base/gui
       ../base/home.nix
     ];
+
+  # enable management of XDG base directories on macOS.
+  xdg.enable = true;
 }
diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix
index 6d7dd77c..2f920b4c 100644
--- a/modules/darwin/apps.nix
+++ b/modules/darwin/apps.nix
@@ -188,6 +188,9 @@ in {
       # "jdk-mission-control" # Java Mission Control
       # "google-cloud-sdk" # Google Cloud SDK
       "miniforge" # Miniconda's community-driven distribution
+
+      # Setup macfuse: https://github.com/macfuse/macfuse/wiki/Getting-Started
+      "macfuse" # for rclone to mount a fuse filesystem
     ];
   };
 }
diff --git a/secrets/darwin.nix b/secrets/darwin.nix
index 2d8b0f27..b76d666d 100644
--- a/secrets/darwin.nix
+++ b/secrets/darwin.nix
@@ -99,6 +99,7 @@
   };
 
   # place secrets in /etc/
+  # NOTE: this will fail for the first time. cause it's running before "activate-agenix"
   environment.etc = {
     # wireguard config used with `wg-quick up wg-business`
     # Fix DNS for WireGuard on macOS: https://github.com/ryan4yin/nix-config/issues/5