From 9e0e9919206e003178e67fd451c24ce88f36671b Mon Sep 17 00:00:00 2001 From: Tyler Starr Date: Wed, 12 Mar 2025 23:24:46 -0700 Subject: [PATCH] migrate yt-dlp --- provision/modules/extra/default.nix | 1 + provision/modules/programs/default.nix | 1 - provision/modules/programs/virt-manager.nix | 1 + provision/modules/programs/yt-dlp.nix | 31 +++++++-------------- 4 files changed, 12 insertions(+), 22 deletions(-) diff --git a/provision/modules/extra/default.nix b/provision/modules/extra/default.nix index 740de69a..0bea0035 100644 --- a/provision/modules/extra/default.nix +++ b/provision/modules/extra/default.nix @@ -3,6 +3,7 @@ imports = [ ../programs/beancount.nix ../programs/borg.nix + ../programs/yt-dlp.nix ]; options.modules.extra.enable = lib.mkEnableOption "extra"; } diff --git a/provision/modules/programs/default.nix b/provision/modules/programs/default.nix index db594002..721b01e4 100644 --- a/provision/modules/programs/default.nix +++ b/provision/modules/programs/default.nix @@ -3,6 +3,5 @@ imports = [ ./appgate-sdp.nix ./virt-manager.nix - ./yt-dlp.nix ]; } diff --git a/provision/modules/programs/virt-manager.nix b/provision/modules/programs/virt-manager.nix index d0a39f39..bedf5b13 100644 --- a/provision/modules/programs/virt-manager.nix +++ b/provision/modules/programs/virt-manager.nix @@ -7,6 +7,7 @@ in { environment.systemPackages = with pkgs; [ virt-manager # Desktop application for managing virtual machines through libvirt ]; + virtualisation.libvirtd.enable = true; programs.dconf.enable = true; }; diff --git a/provision/modules/programs/yt-dlp.nix b/provision/modules/programs/yt-dlp.nix index ea6943f6..82595713 100644 --- a/provision/modules/programs/yt-dlp.nix +++ b/provision/modules/programs/yt-dlp.nix @@ -1,23 +1,12 @@ { config, lib, pkgs, user, ... }: - -let cfg = config.modules.programs.yt-dlp; -in { - options.modules.programs.yt-dlp = with lib; { - enable = lib.mkOption { - type = with types; bool; - default = true; - }; - }; - - config = lib.mkIf cfg.enable { - environment.systemPackages = with pkgs; [ - yt-dlp # Command-line tool to download videos - (pkgs.writeScriptBin "ytd_audio" '' - #!/usr/bin/env bash - yt-dlp -x \ - -ciw -o "%(title)s.%(ext)s" \ - --embed-thumbnail -S acodec:m4a "$1" - '') - ]; - }; +{ + environment.systemPackages = with pkgs; [ + yt-dlp # Command-line tool to download videos + (pkgs.writeScriptBin "ytd_audio" '' + #!/usr/bin/env bash + yt-dlp -x \ + -ciw -o "%(title)s.%(ext)s" \ + --embed-thumbnail -S acodec:m4a "$1" + '') + ]; }