From 222228742f7bdd57e7d1874b80fc87ae4e3db599 Mon Sep 17 00:00:00 2001
From: Kat Huang <kkathuang@gmail.com>
Date: Sat, 25 Apr 2026 17:26:51 -0700
Subject: [PATCH] Fix Darwin dotfile symlink targets

---
 nix-darwin/home/common.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/nix-darwin/home/common.nix b/nix-darwin/home/common.nix
index 06df9eb5..cc87c313 100644
--- a/nix-darwin/home/common.nix
+++ b/nix-darwin/home/common.nix
@@ -6,7 +6,8 @@
   pkgs,
   ...
 }: let
-  dotfilesDir = builtins.dirOf (toString libDir);
+  srcDotfilesDir = builtins.dirOf libDir;
+  worktreeDotfilesDir = "${config.home.homeDirectory}/dotfiles/dotfiles";
   outOfStore = config.lib.file.mkOutOfStoreSymlink;
   replaceRuntimeDir = builtins.replaceStrings ["$XDG_RUNTIME_DIR"] ["\${XDG_RUNTIME_DIR}"];
   gpgKeyPath = replaceRuntimeDir config.age.secrets.gpg-keys.path;
@@ -78,17 +79,17 @@
     name = ".${name}";
     value = {
       force = true;
-      source = outOfStore "${dotfilesDir}/${name}";
+      source = outOfStore "${worktreeDotfilesDir}/${name}";
     };
-  }) (lib.subtractLists excludedTopLevelEntries (builtins.attrNames (builtins.readDir dotfilesDir))));
+  }) (lib.subtractLists excludedTopLevelEntries (builtins.attrNames (builtins.readDir srcDotfilesDir))));
 
   xdgConfigLinks = lib.listToAttrs (map (name: {
     name = name;
     value = {
       force = true;
-      source = outOfStore "${dotfilesDir}/config/${name}";
+      source = outOfStore "${worktreeDotfilesDir}/config/${name}";
     };
-  }) (lib.subtractLists excludedConfigEntries (builtins.attrNames (builtins.readDir "${dotfilesDir}/config"))));
+  }) (lib.subtractLists excludedConfigEntries (builtins.attrNames (builtins.readDir "${srcDotfilesDir}/config"))));
 in {
   imports = [
     inputs.agenix.homeManagerModules.default