mirror of
https://codeberg.org/leana8959/.files.git
synced 2025-12-06 14:49:14 +00:00
nix: use mkIf instead of optional
This commit is contained in:
parent
e317faf178
commit
6e4155b64a
3 changed files with 20 additions and 14 deletions
|
|
@ -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)
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue