programs: factor ffmpeg/yt-dlp & friends out of consoleUtils
This commit is contained in:
parent
88e5efd1f3
commit
e5ce7c02ef
|
@ -19,6 +19,7 @@
|
||||||
sane.programs.iphoneUtils.enableFor.user.colin = true;
|
sane.programs.iphoneUtils.enableFor.user.colin = true;
|
||||||
|
|
||||||
sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
|
sane.programs.guiApps.suggestedPrograms = [ "desktopGuiApps" ];
|
||||||
|
sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
|
||||||
|
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
|
||||||
|
|
|
@ -19,6 +19,7 @@
|
||||||
"desktopGuiApps"
|
"desktopGuiApps"
|
||||||
"stepmania"
|
"stepmania"
|
||||||
];
|
];
|
||||||
|
sane.programs.consoleUtils.suggestedPrograms = [ "consoleMediaUtils" ];
|
||||||
|
|
||||||
sops.secrets.colin-passwd.neededForUsers = true;
|
sops.secrets.colin-passwd.neededForUsers = true;
|
||||||
|
|
||||||
|
|
|
@ -90,8 +90,19 @@ let
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
consoleMediaPkgs = {
|
||||||
|
inherit (pkgs)
|
||||||
|
ffmpeg
|
||||||
|
imagemagick
|
||||||
|
sox
|
||||||
|
yt-dlp
|
||||||
|
;
|
||||||
|
};
|
||||||
# TODO: split these into smaller groups.
|
# 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 = {
|
consolePkgs = {
|
||||||
inherit (pkgs)
|
inherit (pkgs)
|
||||||
alsaUtils # for aplay, speaker-test
|
alsaUtils # for aplay, speaker-test
|
||||||
|
@ -106,12 +117,10 @@ let
|
||||||
gocryptfs
|
gocryptfs
|
||||||
gopass # TODO: shouldn't be needed here
|
gopass # TODO: shouldn't be needed here
|
||||||
gopass-jsonapi
|
gopass-jsonapi
|
||||||
imagemagick
|
|
||||||
kitty # TODO: move to GUI, but `ssh servo` from kitty sets `TERM=xterm-kitty` in the remove and breaks things
|
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
|
libsecret # for managing user keyrings
|
||||||
lm_sensors # for sensors-detect
|
lm_sensors # for sensors-detect
|
||||||
lshw
|
lshw
|
||||||
ffmpeg
|
|
||||||
# memtester
|
# memtester
|
||||||
neovim
|
neovim
|
||||||
# nettools
|
# nettools
|
||||||
|
@ -124,14 +133,13 @@ let
|
||||||
# ponymix
|
# ponymix
|
||||||
pulsemixer
|
pulsemixer
|
||||||
python3
|
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
|
rsync
|
||||||
# python3Packages.eyeD3 # music tagging
|
# python3Packages.eyeD3 # music tagging
|
||||||
sane-scripts
|
sane-scripts
|
||||||
sequoia
|
sequoia
|
||||||
snapper
|
snapper
|
||||||
sops
|
sops
|
||||||
sox
|
|
||||||
speedtest-cli
|
speedtest-cli
|
||||||
# ssh-to-age
|
# ssh-to-age
|
||||||
sudo
|
sudo
|
||||||
|
@ -140,8 +148,6 @@ let
|
||||||
wireguard-tools
|
wireguard-tools
|
||||||
xdg-utils # for xdg-open
|
xdg-utils # for xdg-open
|
||||||
# yarn
|
# yarn
|
||||||
# youtube-dl
|
|
||||||
yt-dlp
|
|
||||||
zsh
|
zsh
|
||||||
;
|
;
|
||||||
};
|
};
|
||||||
|
@ -258,6 +264,7 @@ let
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
sane.programs = lib.mkMerge [
|
sane.programs = lib.mkMerge [
|
||||||
|
(declarePkgs consoleMediaPkgs)
|
||||||
(declarePkgs consolePkgs)
|
(declarePkgs consolePkgs)
|
||||||
(declarePkgs desktopGuiPkgs)
|
(declarePkgs desktopGuiPkgs)
|
||||||
(declarePkgs guiPkgs)
|
(declarePkgs guiPkgs)
|
||||||
|
@ -269,6 +276,10 @@ in
|
||||||
(declarePkgs otherPkgs)
|
(declarePkgs otherPkgs)
|
||||||
{
|
{
|
||||||
# link the various package sets into their own meta packages
|
# link the various package sets into their own meta packages
|
||||||
|
consoleMediaUtils = {
|
||||||
|
package = null;
|
||||||
|
suggestedPrograms = attrNames consoleMediaPkgs;
|
||||||
|
};
|
||||||
consoleUtils = {
|
consoleUtils = {
|
||||||
package = null;
|
package = null;
|
||||||
suggestedPrograms = attrNames consolePkgs;
|
suggestedPrograms = attrNames consolePkgs;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user