summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Kleen <gkleen@yggdrasil.li>2021-11-03 09:52:52 +0100
committerGregor Kleen <gkleen@yggdrasil.li>2021-11-03 09:52:52 +0100
commit128904cd3b9e6ecf7ee5a91564b0f0c67deb4530 (patch)
tree7306ba4558145b5f54311569199f04743951b571
parent3b37f9780e11bb8a8f7320e7cf2ba7a5b6a4b89b (diff)
downloadnixos-128904cd3b9e6ecf7ee5a91564b0f0c67deb4530.tar
nixos-128904cd3b9e6ecf7ee5a91564b0f0c67deb4530.tar.gz
nixos-128904cd3b9e6ecf7ee5a91564b0f0c67deb4530.tar.bz2
nixos-128904cd3b9e6ecf7ee5a91564b0f0c67deb4530.tar.xz
nixos-128904cd3b9e6ecf7ee5a91564b0f0c67deb4530.zip
gkleen@sif: switch to yt-dlp
-rw-r--r--accounts/gkleen@sif/default.nix4
-rw-r--r--user-profiles/mpv/default.nix6
-rw-r--r--user-profiles/yt-dlp.nix17
3 files changed, 23 insertions, 4 deletions
diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 617c178c..e569f732 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -61,7 +61,7 @@ let
61 ''; 61 '';
62in { 62in {
63 imports = with flake.nixosModules.userProfiles.${userName}; [ 63 imports = with flake.nixosModules.userProfiles.${userName}; [
64 mpv 64 mpv yt-dlp
65 ]; 65 ];
66 66
67 home-manager.users.${userName} = { 67 home-manager.users.${userName} = {
@@ -246,7 +246,7 @@ in {
246 home = { 246 home = {
247 packages = with pkgs; [ 247 packages = with pkgs; [
248 fira-code powerline-fonts nerdfonts pavucontrol keepassxc 248 fira-code powerline-fonts nerdfonts pavucontrol keepassxc
249 youtube-dl sxiv xclip mumble pulseaudio-ctl libnotify synergy 249 sxiv xclip mumble pulseaudio-ctl libnotify synergy
250 xorg.xbacklight screen-message pidgin-with-plugins 250 xorg.xbacklight screen-message pidgin-with-plugins
251 google-play-music-desktop-player qt5ct playerctl evince 251 google-play-music-desktop-player qt5ct playerctl evince
252 thunderbird wrappedZulip zoom-us steam steam-run wireshark skype 252 thunderbird wrappedZulip zoom-us steam steam-run wireshark skype
diff --git a/user-profiles/mpv/default.nix b/user-profiles/mpv/default.nix
index 642eb004..f8454508 100644
--- a/user-profiles/mpv/default.nix
+++ b/user-profiles/mpv/default.nix
@@ -8,8 +8,10 @@
8 config = { 8 config = {
9 ytdl = true; 9 ytdl = true;
10 ytdl-format = lib.concatStringsSep "/" [ 10 ytdl-format = lib.concatStringsSep "/" [
11 "bestvideo[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]" 11 "bestvideo[width<=1920][height<=1080][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
12 "best[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]" 12 "best[width<=1920][height<=1080][fps<=60][protocol!=http_dash_segments]"
13 # "bestvideo[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
14 # "best[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]"
13 "best[protocol!=http_dash_segments]" 15 "best[protocol!=http_dash_segments]"
14 ]; 16 ];
15 ytdl-raw-options = lib.concatStringsSep "," [ 17 ytdl-raw-options = lib.concatStringsSep "," [
diff --git a/user-profiles/yt-dlp.nix b/user-profiles/yt-dlp.nix
new file mode 100644
index 00000000..946fd8d0
--- /dev/null
+++ b/user-profiles/yt-dlp.nix
@@ -0,0 +1,17 @@
1{ config, lib, userName, pkgs, ... }:
2{
3 home-manager.users.${userName} = {
4 home.packages = with pkgs; [ yt-dlp ];
5 xdg.configFile."yt-dlp/config".text = ''
6 --netrc
7 --mark-watched
8 --format ${lib.concatStringsSep "/" [
9 "bestvideo[width<=1920][height<=1080][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
10 "best[width<=1920][height<=1080][fps<=60][protocol!=http_dash_segments]"
11 # "bestvideo[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]+bestaudio[protocol!=http_dash_segments]"
12 # "best[width<=2560][height<=1440][fps<=60][protocol!=http_dash_segments]"
13 "best[protocol!=http_dash_segments]"
14 ]}
15 '';
16 };
17}