all repos — nixfiles @ 5943a4da9b5e2dd6d9824bea211ef95d2034a75b

System and user configuration, managed by nix and home-manager

zed: fix `zed` cli not opening files in darwin app

Alin
commit

5943a4da9b5e2dd6d9824bea211ef95d2034a75b

parent

8968ddfd5fd86a51097fbe3b4779d5466f37f994

1 file changed, 16 insertions(+), 8 deletions(-)

changed files
M user/settings/zed.nix → user/settings/zed.nix
@@ -3,9 +3,6 @@ config,
   lib,
   ...
 }:
-let
-  isCalledZed = config.programs.zed-editor.package == null;
-in
 {
   programs.zed-editor = {
     enable = true;

@@ -207,14 +204,25 @@ }
     ];
   };
   programs.fish = {
-    shellAliases = lib.mkIf (!isCalledZed) {
-      zed = "zeditor";
-    };
     interactiveShellInit = lib.mkOrder 900 ''
       if set --query ZED_TERM
-          set --export EDITOR ${if isCalledZed then "zed" else "zeditor"} -w
-          set --export VISUAL $EDITOR
+          set --export EDITOR zed
+          set --export VISUAL zed
       end
     '';
   };
+
+  home.activation =
+    let
+      inherit (config.targets.darwin) copyApps;
+      inherit (config.home) homeDirectory;
+      cli = "${homeDirectory}/${copyApps.directory}/Zed.App/Contents/MacOS/cli";
+    in
+    lib.mkIf (copyApps.enable && config.programs.zed-editor.package != null) {
+      zed-link-cli-bin = lib.hm.dag.entryAfter [ "writeBoundary" ] ''
+        run ln -s $VERBOSE_ARG \
+          ${lib.escapeShellArg cli} \
+          ${lib.escapeShellArg config.xdg.binHome}/zed
+      '';
+    };
 }