From c13a102967b9c7b4afacf371e4ccfd89b3be12b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9ana=20=E6=B1=9F?= <leana.jiang+git@icloud.com>
Date: Wed, 16 Jul 2025 17:39:14 +0200
Subject: [PATCH] fish: refactor

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

diff --git a/nix/homeModules/common/fish/aliasesAbbrs.nix b/nix/homeModules/common/fish/aliasesAbbrs.nix
index 9352f767..253dae7f 100644
--- a/nix/homeModules/common/fish/aliasesAbbrs.nix
+++ b/nix/homeModules/common/fish/aliasesAbbrs.nix
@@ -4,8 +4,8 @@
   ...
 }: {
   programs.fish = {
-    shellAbbrs = lib.mergeAttrsList [
-      (lib.optionalAttrs pkgs.stdenv.isLinux {
+    shellAbbrs = lib.mkMerge [
+      (lib.mkIf pkgs.stdenv.isLinux {
         "," = "nix-shell -p";
       })
     ];
@@ -16,7 +16,7 @@
         tree = "tree -Cph";
       }
 
-      (lib.optionalAttrs pkgs.stdenv.isLinux {
+      (lib.mkIf pkgs.stdenv.isLinux {
         # idiot protection
         chmod = "chmod --preserve-root";
         chown = "chown --preserve-root";