From e4d23b596cf8153da1efa52b876121b1d1d83295 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Mon, 25 Sep 2023 15:28:11 +0800 Subject: [PATCH] profiles/desktop: make Blender optional Only when the Blender Nix module is not configured. --- modules/home-manager/profiles/desktop.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/modules/home-manager/profiles/desktop.nix b/modules/home-manager/profiles/desktop.nix index 7d80defd..5797bcee 100644 --- a/modules/home-manager/profiles/desktop.nix +++ b/modules/home-manager/profiles/desktop.nix @@ -1,5 +1,5 @@ # Enables all of my usual setup for desktop-oriented stuff. -{ config, options, lib, pkgs, ... }: +{ config, options, lib, pkgs, osConfig ? { }, ... }: let cfg = config.profiles.desktop; in { @@ -17,7 +17,6 @@ in { (lib.mkIf cfg.graphics.enable { home.packages = with pkgs; [ aseprite # Pixel art wannabe tool. - blender # 3D modelling wannabe tool. emulsion-palette # Manage your color palettes. eyedropper # Gotta keep your monitor moist. inkscape-with-extensions # Illustration wannabe tool. @@ -27,7 +26,7 @@ in { ffmpeg-full # Ah yes, everyman's multimedia swiss army knife. imagemagick # Ah yes, everyman's image manipulation tool. gmic # Don't let the gimmicks fool you, it's a magical image framework. - ]; + ] ++ (lib.optional (osConfig ? programs.blender.enable && !osConfig.programs.blender.enable) blender); }) (lib.mkIf cfg.audio.enable {