christoph/flake-nixinator
1
Fork 0
Code Activity

use of lib.optionals instead of mkIf

Browse Source
This commit is contained in:
Christoph Urlacher
2022-08-08 12:27:40 +02:00
parent 2bb3b9d93b
commit 4a819afb74
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
home/modules/audio.nix
View File

@ -51,16 +51,20 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
# I changed to regular if to stay consistent with flatpak module, mkIf doesn't always work for some reason # Use builtins.concatLists instead of mkMerge as this is more safe as the type is specified,
home.packages = with pkgs; (builtins.concatLists [ # also mkMerge doesn't work in every case as it yields a set
# (mkIf cfg.carla.enable [ carla ]) home.packages = with pkgs; builtins.concatLists [
# (mkIf cfg.yabridge.enable [ yabridge yabridgectl ])
# (mkIf cfg.bitwig.enable [ bitwig-studio ]) # lib.optional is preferred over mkIf or if...then...else by nix coding standards
(if cfg.carla.enable then [ carla ] else [ ]) # lib.optional wraps its argument in a list, lib.optionals doesn't
(if cfg.yabridge.enable then [ yabridge yabridgectl ] else [ ]) # This means that lib.optional can be used for single packages/arguments
(if cfg.bitwig.enable then [ bitwig-studio ] else [ ]) # and lib.optionals has to be used when the argument is itself a list
# I use lib.optionals everywhere as I think this is more clear
(optionals cfg.carla.enable [ carla ])
(optionals cfg.yabridge.enable [ yabridge yabridgectl ])
(optionals cfg.bitwig.enable [ bitwig-studio ])
cfg.extraPackages cfg.extraPackages
]); ];
# NOTE: This desktop entry is created in /etc/profiles/per-user/christoph/share/applications # NOTE: This desktop entry is created in /etc/profiles/per-user/christoph/share/applications
# This location is part of XDG_DATA_DIRS # This location is part of XDG_DATA_DIRS
@ -73,7 +77,7 @@ in {
categories = [ "Music" "Audio" ]; categories = [ "Music" "Audio" ];
}; };
home.activation = (mkMerge [ home.activation = mkMerge [
(mkIf cfg.carla.enable { (mkIf cfg.carla.enable {
# The module includes the default carla project with ArchetypePetrucci + ArchetypeGojira # The module includes the default carla project with ArchetypePetrucci + ArchetypeGojira
@ -90,7 +94,6 @@ in {
yabridgectl sync yabridgectl sync
''; '';
}) })
]); ];
}; };
} }