nix: use mkIf instead of optional

This commit is contained in:
Léana 江 2024-05-05 11:50:23 +02:00 committed by Léana 江
parent e317faf178
commit 6e4155b64a
3 changed files with 20 additions and 14 deletions

View file

@ -75,13 +75,15 @@ let
in
{
programs.fish = {
shellAbbrs =
shellAbbrs = lib.mkMerge [
abbrs
// (lib.attrsets.optionalAttrs pkgs.stdenv.isLinux abbrsLinux)
// (lib.attrsets.optionalAttrs pkgs.stdenv.isDarwin abbrsDarwin);
shellAliases =
(lib.mkIf pkgs.stdenv.isLinux abbrsLinux)
(lib.mkIf pkgs.stdenv.isDarwin abbrsDarwin)
];
shellAliases = lib.mkMerge [
aliases
// (lib.attrsets.optionalAttrs pkgs.stdenv.isLinux aliasesLinux)
// (lib.attrsets.optionalAttrs pkgs.stdenv.isDarwin aliasesDarwin);
(lib.mkIf pkgs.stdenv.isLinux aliasesLinux)
(lib.mkIf pkgs.stdenv.isDarwin aliasesDarwin)
];
};
}