From a2817fef0dd4d541a3161d124896ef44793ff6a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Sun, 1 Feb 2026 20:37:39 +0100
Subject: [PATCH] home/fish: fix nix gotchas

---
 nix/homeModules/common/fish/aliasesAbbrs.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nix/homeModules/common/fish/aliasesAbbrs.nix b/nix/homeModules/common/fish/aliasesAbbrs.nix
index 8affff1d..9c7d123d 100644
--- a/nix/homeModules/common/fish/aliasesAbbrs.nix
+++ b/nix/homeModules/common/fish/aliasesAbbrs.nix
@@ -5,13 +5,11 @@
 }:
 {
   programs.fish = {
-    shellAbbrs = lib.mkMerge [
-      (lib.mkIf pkgs.stdenv.isLinux {
-        "," = "nix-shell --command $SHELL -p";
-      })
-    ];
+    shellAbbrs = lib.mkIf pkgs.stdenv.isLinux {
+      "," = "nix-shell --command $SHELL -p";
+    };
 
-    shellAliases = lib.mergeAttrsList [
+    shellAliases = lib.mkMerge [
       {
         rm = "rm -I"; # idiot protection
         tree = "tree -Cph";