From 2639ac3cf714b6000f0dfa9adfad140a450d8217 Mon Sep 17 00:00:00 2001 From: Ingolf Wagner Date: Fri, 8 Sep 2023 09:46:41 +0200 Subject: [PATCH] various unimportant changes --- nixos/machines/chungus/configuration.nix | 1 + nixos/machines/chungus/media-youtube.nix | 18 +++++++++++++++++- nixos/machines/cream/packages.nix | 14 +++++++++++++- nixos/machines/cream/rethinkdb.nix | 1 + 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 nixos/machines/cream/rethinkdb.nix diff --git a/nixos/machines/chungus/configuration.nix b/nixos/machines/chungus/configuration.nix index d97a25c..3abc809 100644 --- a/nixos/machines/chungus/configuration.nix +++ b/nixos/machines/chungus/configuration.nix @@ -49,6 +49,7 @@ #./kiosk.nix ./trilium.nix ./gitea.nix + #./atuin.nix ./cache.nix diff --git a/nixos/machines/chungus/media-youtube.nix b/nixos/machines/chungus/media-youtube.nix index 96fca21..d49a65a 100644 --- a/nixos/machines/chungus/media-youtube.nix +++ b/nixos/machines/chungus/media-youtube.nix @@ -51,6 +51,16 @@ let target = "/media/youtube/series/Sunk Cost Galaxy"; output = "Sunk Cost Galaxy S01E%(playlist_index)s %(title)s.%(ext)s"; }; + BigLez = { + url = "https://www.youtube.com/watch?list=PLGMC7oz7XpmCR1RWxqvFWvXVO_ry6FdHI"; + target = "/media/youtube/series/Big Lez"; + output = "Big Lez S01E%(playlist_index)s %(title)s.%(ext)s"; + }; + Sassy = { + url = "https://www.youtube.com/watch?v=Dw_tGRblTXk"; + target = "/media/youtube/series/Big Lez"; + output = "Big Lez S02E01 %(title)s.%(ext)s"; + }; # channels # -------- @@ -145,6 +155,11 @@ let target = "/media/youtube/loot"; output = "%(title)s.%(ext)s"; }; + FridayVideos = { + url = "https://www.youtube.com/playlist?list=PLP33x-q_GftbqHBybHABOwsRcUX7XZl_D"; + target = "/media/youtube/loot"; + output = "%(title)s.%(ext)s"; + }; }; downloadScript = @@ -154,6 +169,7 @@ let , sponsorBlockCategories ? [ "default" ] , notOlderThan ? "" # e.g: 1week , breakOnExisting ? true + , reverse ? false }: pkgs.writers.writeDash "download-script-${name}" '' mkdir -p "${target}" yt-dlp \ @@ -161,7 +177,7 @@ let --no-mark-watched \ --continue \ ${optionalString (notOlderThan != "") "--dateafter now-${notOlderThan}" } \ - --playlist-reverse \ + ${optionalString reverse "--playlist-reverse" } \ --download-archive "${target}/.downloaded.txt" \ --output "${target}/${output}" \ --format "bestvideo[ext=mp4]+bestaudio[ext=m4a]" \ diff --git a/nixos/machines/cream/packages.nix b/nixos/machines/cream/packages.nix index 0cb6ff2..1eb6e73 100644 --- a/nixos/machines/cream/packages.nix +++ b/nixos/machines/cream/packages.nix @@ -82,7 +82,19 @@ in #fractal #legacy_2205.mirage-im #cinny-desktop - fluffychat + #fluffychat + #(fluffychat.overrideAttrs + # (old: rec { + # version = "1.13.0"; + # src = fetchFromGitHub { + # owner = "krille-chan"; + # repo = "fluffychat"; + # rev = "v${version}"; + # hash = "sha256-w29Nxs/d0b18jMvWnrRUjEGqY4jGtuEGodg+ncCAaVc="; + # }; + # vendorHash = ""; + # }) + #) tor-browser-bundle-bin #(tor-browser-bundle-bin.overrideAttrs (old: rec { diff --git a/nixos/machines/cream/rethinkdb.nix b/nixos/machines/cream/rethinkdb.nix new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/nixos/machines/cream/rethinkdb.nix @@ -0,0 +1 @@ +