From e5ce7c02ef53e0fc6be741fc5f4afd08ca562dd6 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Fri, 9 Jun 2023 00:57:53 +0000
Subject: [PATCH] programs: factor ffmpeg/yt-dlp & friends out of consoleUtils

---
 hosts/by-name/desko/default.nix    |  1 +
 hosts/by-name/lappy/default.nix    |  1 +
 hosts/common/programs/assorted.nix | 25 ++++++++++++++++++-------
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/hosts/by-name/desko/default.nix b/hosts/by-name/desko/default.nix
index c3f67ea0..6ed1a27f 100644
--- a/hosts/by-name/desko/default.nix
+++ b/hosts/by-name/desko/default.nix
@@ -19,6 +19,7 @@
   sane.programs.iphoneUtils.enableFor.user.colin = true;
 
   sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
+  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
 
   boot.loader.efi.canTouchEfiVariables = false;
   sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
diff --git a/hosts/by-name/lappy/default.nix b/hosts/by-name/lappy/default.nix
index 149109c6..ee475eec 100644
--- a/hosts/by-name/lappy/default.nix
+++ b/hosts/by-name/lappy/default.nix
@@ -19,6 +19,7 @@
     "desktopGuiApps"
     "stepmania"
   ];
+  sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
 
   sops.secrets.colin-passwd.neededForUsers = true;
 
diff --git a/hosts/common/programs/assorted.nix b/hosts/common/programs/assorted.nix
index 69402d54..2722eac2 100644
--- a/hosts/common/programs/assorted.nix
+++ b/hosts/common/programs/assorted.nix
@@ -90,8 +90,19 @@ let
     ;
   };
 
+  consoleMediaPkgs = {
+    inherit (pkgs)
+      ffmpeg
+      imagemagick
+      sox
+      yt-dlp
+    ;
+  };
   # TODO: split these into smaller groups.
-  # - transcoders (ffmpeg, imagemagick) only wanted on desko/lappy ("powerutils"?)
+  # - moby doesn't want a lot of these.
+  # - categories like
+  #   - dev?
+  #   - debugging?
   consolePkgs = {
     inherit (pkgs)
       alsaUtils  # for aplay, speaker-test
@@ -106,12 +117,10 @@ let
       gocryptfs
       gopass  # TODO: shouldn't be needed here
       gopass-jsonapi
-      imagemagick
       kitty  # TODO: move to GUI, but `ssh servo` from kitty sets `TERM=xterm-kitty` in the remove and breaks things
       libsecret  # for managing user keyrings
       lm_sensors  # for sensors-detect
       lshw
-      ffmpeg
       # memtester
       neovim
       # nettools
@@ -124,14 +133,13 @@ let
       # ponymix
       pulsemixer
       python3
-      ripgrep  # needed as a user package, for config.
+      ripgrep  # needed as a user package so that its user-level config file can be installed
       rsync
       # python3Packages.eyeD3  # music tagging
       sane-scripts
       sequoia
       snapper
       sops
-      sox
       speedtest-cli
       # ssh-to-age
       sudo
@@ -140,8 +148,6 @@ let
       wireguard-tools
       xdg-utils  # for xdg-open
       # yarn
-      # youtube-dl
-      yt-dlp
       zsh
     ;
   };
@@ -258,6 +264,7 @@ let
 in
 {
   sane.programs = lib.mkMerge [
+    (declarePkgs consoleMediaPkgs)
     (declarePkgs consolePkgs)
     (declarePkgs desktopGuiPkgs)
     (declarePkgs guiPkgs)
@@ -269,6 +276,10 @@ in
     (declarePkgs otherPkgs)
     {
       # link the various package sets into their own meta packages
+      consoleMediaUtils = {
+        package = null;
+        suggestedPrograms = attrNames consoleMediaPkgs;
+      };
       consoleUtils = {
         package = null;
         suggestedPrograms = attrNames consolePkgs;