From 32cf7403004d423de9f02a82bb104f388ae5cc86 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Fri, 29 May 2026 01:28:39 +0200 Subject: treewide: Remove unneeded dependencies This shaves off around 1.2 GB from the system closure. --- modules/by-name/cl/cleanup/module.nix | 3 +++ modules/by-name/lf/lf/commands/default.nix | 2 +- modules/by-name/lf/lf/ctpv/prev/audio/default.nix | 2 +- modules/by-name/mp/mpd/module.nix | 5 ++++ modules/by-name/mp/mpd/mpc.nix | 32 ++++++++++++++--------- modules/by-name/mp/mpv/module.nix | 10 ++++--- modules/by-name/ri/river/keymap.nix | 9 ++++--- 7 files changed, 42 insertions(+), 21 deletions(-) (limited to 'modules/by-name') diff --git a/modules/by-name/cl/cleanup/module.nix b/modules/by-name/cl/cleanup/module.nix index 98c699eb..9b42b337 100644 --- a/modules/by-name/cl/cleanup/module.nix +++ b/modules/by-name/cl/cleanup/module.nix @@ -21,6 +21,9 @@ in { config = lib.mkIf cfg.enable { programs.nano.enable = false; + + services.speechd.enable = false; + environment = { defaultPackages = lib.mkForce []; }; diff --git a/modules/by-name/lf/lf/commands/default.nix b/modules/by-name/lf/lf/commands/default.nix index b6baf1df..e8230556 100644 --- a/modules/by-name/lf/lf/commands/default.nix +++ b/modules/by-name/lf/lf/commands/default.nix @@ -61,7 +61,7 @@ in { name = "archive_decompress"; dependencies = [ pkgs.gnutar - pkgs.openjdk + pkgs.openjdk_headless pkgs.p7zip pkgs.xz pkgs.gzip diff --git a/modules/by-name/lf/lf/ctpv/prev/audio/default.nix b/modules/by-name/lf/lf/ctpv/prev/audio/default.nix index 08a2f9d6..b9d4ff0d 100644 --- a/modules/by-name/lf/lf/ctpv/prev/audio/default.nix +++ b/modules/by-name/lf/lf/ctpv/prev/audio/default.nix @@ -14,7 +14,7 @@ matches.mime = ["audio/*"]; dependencies = [ pkgs.ffmpegthumbnailer - pkgs.ffmpeg + pkgs.ffmpeg-headless pkgs.chafa pkgs.exiftool diff --git a/modules/by-name/mp/mpd/module.nix b/modules/by-name/mp/mpd/module.nix index 37c648c6..474d81c4 100644 --- a/modules/by-name/mp/mpd/module.nix +++ b/modules/by-name/mp/mpd/module.nix @@ -62,6 +62,11 @@ in { services.mpd = { enable = true; + + package = pkgs.mpd.override { + ffmpeg = pkgs.ffmpeg-headless; + }; + network = { listenAddress = socketPath; }; diff --git a/modules/by-name/mp/mpd/mpc.nix b/modules/by-name/mp/mpd/mpc.nix index cd4a4ec0..5fbeddc5 100644 --- a/modules/by-name/mp/mpd/mpc.nix +++ b/modules/by-name/mp/mpd/mpc.nix @@ -14,10 +14,28 @@ ... }: let cfg = config.soispha.services.mpd.mpc; + + mpp = pkgs.mpp.override { + # Removes the currently playing song from the disk and storage + mpp-beetrm = pkgs.mpp-beetrm.override { + beets = cfg.beetsPkg; + }; + + # Works like normal `mpc searchadd` but uses the `beets` query syntax + mpp-searchadd = pkgs.mpp-searchadd.override { + beets = cfg.beetsPkg; + }; + }; in { options.soispha.services.mpd.mpc = { enable = lib.mkEnableOption "mpc with extensions"; + mppPackage = lib.mkOption { + type = lib.types.package; + description = "The package to use, when calling `mpp`"; + default = mpp; + }; + beetsPkg = lib.mkOption { type = lib.types.package; description = "The package to use, when calling `beet`"; @@ -26,18 +44,8 @@ in { config = lib.mkIf cfg.enable { home-manager.users.soispha.home.packages = [ - pkgs.mpp # Wrapper around `mpc` that allows the usage of `mpc-{beetsrm,lyrics,searchadd}` (below) without the `-` - - # Removes the currently playing song from the disk and storage - (pkgs.mpp-beetrm.override { - beets = cfg.beetsPkg; - }) - # Works like normal `mpc searchadd` but uses the `beets` query syntax - (pkgs.mpp-searchadd.override { - beets = cfg.beetsPkg; - }) - # Displays the lyrics of the currently playing song - pkgs.mpp-lyrics + # Wrapper around `mpc` that allows the usage of `mpc-{beetsrm,lyrics,searchadd}` + cfg.mppPackage ]; }; } diff --git a/modules/by-name/mp/mpv/module.nix b/modules/by-name/mp/mpv/module.nix index 4416b295..0610dcd8 100644 --- a/modules/by-name/mp/mpv/module.nix +++ b/modules/by-name/mp/mpv/module.nix @@ -23,11 +23,18 @@ in { programs.mpv = { enable = true; + package = pkgs.mpv.override { + mpv-unwrapped = pkgs.mpv-unwrapped.override { + ffmpeg = pkgs.ffmpeg-headless; + }; + }; + bindings = { q = "quit 0"; "Ctrl+c" = "quit 1"; "Shift+q" = "quit-watch-later 1"; }; + config = { osd-bar = true; @@ -46,9 +53,6 @@ in { max_width = 250; }; }; - scripts = [ - pkgs.mpvScripts.thumbfast - ]; }; }; } diff --git a/modules/by-name/ri/river/keymap.nix b/modules/by-name/ri/river/keymap.nix index 9bcbf387..eacfd75b 100644 --- a/modules/by-name/ri/river/keymap.nix +++ b/modules/by-name/ri/river/keymap.nix @@ -37,6 +37,7 @@ }; cfg = config.soispha.programs.river; + inherit (config.soispha.services.mpd.mpc) mppPackage; in { soispha.programs.river.init.mappings.keymap = lib.mkIf cfg.enable (lib.fixedPoints.fix (self: { @@ -46,7 +47,7 @@ in { "a" = mkSpawn pkgs.alacritty "" {}; "b" = mkSpawn pkgs.tskm "open select" {once = true;}; "k" = mkSpawn pkgs.keepassxc "" {once = true;}; - "s" = mkSpawn pkgs.signal-desktop "" {once = true;}; + # "s" = mkSpawn pkgs.signal-desktop "" {once = true;}; "p" = mkSpawn pkgs.screenshot_persistent "" {once = true;}; "i" = mkSpawn pkgs.anki "" {once = true;}; }; @@ -76,9 +77,9 @@ in { "u" = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%+" {}; "d" = mkSpawn' pkgs.wireplumber "wpctl" "set-volume @DEFAULT_SINK@ 5%-" {}; "m" = mkSpawn' pkgs.wireplumber "wpctl" "set-mute @DEFAULT_SINK@ toggle" {}; - "n" = mkSpawn pkgs.mpp "next" {}; - "p" = mkSpawn pkgs.mpp "prev" {}; - "t" = mkSpawn pkgs.mpp "toggle" {}; + "n" = mkSpawn mppPackage "next" {}; + "p" = mkSpawn mppPackage "prev" {}; + "t" = mkSpawn mppPackage "toggle" {}; "g" = mkSpawn' pkgs.mpdpopm "mpdpopm" "rating inc" {once = true;}; "b" = mkSpawn' pkgs.mpdpopm "mpdpopm" "rating decr" {once = true;}; }; -- cgit 1.4.1