From 3ffb139580a5cade9f39b9eb55efa5e7c2127b41 Mon Sep 17 00:00:00 2001 From: Simon Parri Date: Sun, 6 Jul 2025 11:12:10 -0500 Subject: modules/sets: Split media.tools into minimal and full --- hosts/bean/common.nix | 2 +- hosts/carrot/default.nix | 2 +- hosts/thyme/packages.nix | 2 +- hosts/tomato/packages.nix | 2 +- modules/sets.nix | 15 +++++++++------ 5 files changed, 13 insertions(+), 10 deletions(-) diff --git a/hosts/bean/common.nix b/hosts/bean/common.nix index 4a86540..d0a84a3 100644 --- a/hosts/bean/common.nix +++ b/hosts/bean/common.nix @@ -23,7 +23,7 @@ in cli.tools.full = true; gui.tools.full = true; gui.fonts = true; - media.tools = true; + media.tools.minimal = true; net.tools.minimal = true; sound.tools = true; sync.tools = true; diff --git a/hosts/carrot/default.nix b/hosts/carrot/default.nix index 96f349b..bbe1370 100644 --- a/hosts/carrot/default.nix +++ b/hosts/carrot/default.nix @@ -20,7 +20,7 @@ in this.sets = { cli.tools.full = true; de.utils = true; - media.tools = true; + media.tools.full = true; net.tools.minimal = true; script.utils = true; sound.tools = true; diff --git a/hosts/thyme/packages.nix b/hosts/thyme/packages.nix index c2adc1e..0386efa 100644 --- a/hosts/thyme/packages.nix +++ b/hosts/thyme/packages.nix @@ -14,7 +14,7 @@ image.tools = true; mail.tools = true; manga.dl = true; - media.tools = true; + media.tools.full = true; net.tools.full = true; script.utils = true; sound.tools = true; diff --git a/hosts/tomato/packages.nix b/hosts/tomato/packages.nix index 391ae2c..ccab0c3 100644 --- a/hosts/tomato/packages.nix +++ b/hosts/tomato/packages.nix @@ -18,7 +18,7 @@ in image.tools = true; mail.tools = true; manga.dl = true; - media.tools = true; + media.tools.full = true; net.tools.full = true; script.utils = true; sound.tools = true; diff --git a/modules/sets.nix b/modules/sets.nix index a396fad..e4a503d 100644 --- a/modules/sets.nix +++ b/modules/sets.nix @@ -32,7 +32,8 @@ in image.tools = lib.mkEnableOption "package set"; mail.tools = lib.mkEnableOption "package set"; manga.dl = lib.mkEnableOption "package set"; - media.tools = lib.mkEnableOption "package set"; + media.tools.minimal = lib.mkEnableOption "package set" // { default = cfg.media.tools.full; }; + media.tools.full = lib.mkEnableOption "package set"; net.tools.minimal = lib.mkEnableOption "package set" // { default = cfg.net.tools.full; }; net.tools.full = lib.mkEnableOption "package set"; script.utils = lib.mkEnableOption "package set"; @@ -45,8 +46,8 @@ in gui.usePicom = lib.mkEnableOption "picom package" // { default = true; }; gui.useEmoji = lib.mkEnableOption "emoji font package" // { default = true; }; - de.useKeymapper = lib.mkEnableOption "keymapper" // { default = true; }; - }; + de.useKeymapper = lib.mkEnableOption "keymapper" // { default = true; };; + } config = { environment.systemPackages = @@ -121,12 +122,14 @@ in gallery-dl img2pdf ]; - media.tools = [ + media.tools.minimal = [ + mpv + yt-dlp + ]; + media.tools.full = [ beets exiftool ffmpeg - mpv - yt-dlp ]; net.tools.minimal = [ host -- cgit v1.2.3