From 51b2cff831405d43ee52fe6f4bfb72222ec460fe Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Mon, 21 Aug 2023 13:14:51 -0500 Subject: [PATCH] Video and Nix GC options Add Nix gc options to keep the store reasonably cleaned up Add GStreamer to Jude build Add libbluray overlay with AACS support --- hosts/jude/default.nix | 12 ++++++++++++ modules-all/default.nix | 6 ++++++ overlays/default.nix | 14 +++++++++----- 3 files changed, 27 insertions(+), 5 deletions(-) diff --git a/hosts/jude/default.nix b/hosts/jude/default.nix index 8401320..35ee182 100644 --- a/hosts/jude/default.nix +++ b/hosts/jude/default.nix @@ -17,6 +17,18 @@ greg.kde.enable = false; environment.systemPackages = with pkgs; [ + # Video/Audio data composition framework tools like "gst-inspect", "gst-launch" ... + gst_all_1.gstreamer + # Common plugins like "filesrc" to combine within e.g. gst-launch + gst_all_1.gst-plugins-base + # Specialized plugins separated by quality + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + gst_all_1.gst-plugins-ugly + # Plugins to reuse ffmpeg to play almost every video format + gst_all_1.gst-libav + # Support the Video Audio (Hardware) Acceleration API + gst_all_1.gst-vaapi oathToolkit ]; fileSystems = { diff --git a/modules-all/default.nix b/modules-all/default.nix index 57d8458..ecbdcad 100644 --- a/modules-all/default.nix +++ b/modules-all/default.nix @@ -16,6 +16,12 @@ } ]; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + settings = { auto-optimise-store = true; experimental-features = "nix-command flakes"; diff --git a/overlays/default.nix b/overlays/default.nix index 970ed45..44aa352 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -61,6 +61,10 @@ in rec { pkgs = final.pkgs; }; inject = prev.callPackage ./inject.nix { inherit (final) pkgs; }; + libbluray = prev.libbluray.override { + withAACS = true; + withBDplus = true; + }; setup-ssh = prev.callPackage ./setup-ssh.nix { pkgs = final.pkgs; }; @@ -73,9 +77,9 @@ in rec { ]; }); - bitwarden = macOver ./mac/bitwarden.nix "bitwarden"; - gnucash = macOver ./mac/gnucash.nix "gnucash"; - handbrake = macOver ./mac/handbrake.nix "handbrake"; - onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin"; - vlc = macOver ./mac/vlc.nix "vlc"; + #bitwarden = macOver ./mac/bitwarden.nix "bitwarden"; + #gnucash = macOver ./mac/gnucash.nix "gnucash"; + #handbrake = macOver ./mac/handbrake.nix "handbrake"; + #onlyoffice-bin = macOver ./mac/onlyoffice-bin.nix "onlyoffice-bin"; + #vlc = macOver ./mac/vlc.nix "vlc"; }