From 5813d9b84587445cd1e877d0ac5601ac32a2494b Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Fri, 27 Sep 2024 17:25:13 +0100 Subject: [PATCH 1/5] Install dbeaver --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index ca29a89..5a2aba2 100644 --- a/config/home.nix +++ b/config/home.nix @@ -46,6 +46,7 @@ in { csharp-ls cups curl + dbeaver-bin discord dotnet-sdk_8 dotnetPackages.Nuget From 87ef61ba56d26bdbd0dd87e063619505f14637b1 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Thu, 24 Oct 2024 20:28:36 +0100 Subject: [PATCH 2/5] nix flake update - 24/10/2024 --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 992c919..7490bf9 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1726818100, - "narHash": "sha256-z2V74f5vXqkN5Q+goFlhbFXY/dNaBAyeLpr2bxu4Eic=", + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", "owner": "nix-community", "repo": "home-manager", - "rev": "1bbc1a5a1f4de7401c92db85b2119ed21bb4139d", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", "type": "github" }, "original": { @@ -23,11 +23,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1726688310, - "narHash": "sha256-Xc9lEtentPCEtxc/F1e6jIZsd4MPDYv4Kugl9WtXlz0=", + "lastModified": 1729691686, + "narHash": "sha256-BAuPWW+9fa1moZTU+jFh+1cUtmsuF8asgzFwejM4wac=", "owner": "nixos", "repo": "nixpkgs", - "rev": "dbebdd67a6006bb145d98c8debf9140ac7e651d0", + "rev": "32e940c7c420600ef0d1ef396dc63b04ee9cad37", "type": "github" }, "original": { From 9ca2a2771bb0e3483f610ed346b21298bd13c900 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Mon, 28 Oct 2024 13:05:49 +0000 Subject: [PATCH 3/5] Add yt-dlp config --- config/packages/default.nix | 1 + config/packages/yt-dlp/config | 22 ++++++++++++++++++++++ config/packages/yt-dlp/default.nix | 3 +++ system/shared.nix | 4 ---- 4 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 config/packages/yt-dlp/config create mode 100644 config/packages/yt-dlp/default.nix diff --git a/config/packages/default.nix b/config/packages/default.nix index bc6215b..0e0f4a5 100644 --- a/config/packages/default.nix +++ b/config/packages/default.nix @@ -8,5 +8,6 @@ ./neovim ./picom ./polybar + ./yt-dlp ]; } diff --git a/config/packages/yt-dlp/config b/config/packages/yt-dlp/config new file mode 100644 index 0000000..77467f2 --- /dev/null +++ b/config/packages/yt-dlp/config @@ -0,0 +1,22 @@ +# Output format: album/tracks.format +-o "%(album,playlist_title)U/%(track_number,playlist_index)s - %(title)U.%(ext)s" +--windows-filenames +# --restrict-filenames + +# Extract audio +-f bestaudio +--extract-audio +--audio-format mp3 + +# Thumbnail squared +--convert-thumbnails png +--ppa "ThumbnailsConvertor+ffmpeg_o:-c:v png -vf crop=\"'if(gt(ih,iw),iw,ih)':'if(gt(iw,ih),ih,iw)'\"" +--embed-thumbnail + +# Metadata, with playlist number as track number if the latter is missing +--embed-metadata +--parse-metadata "playlist_index:%(track_number)s" + +# Misc +--no-overwrites +--concurrent-fragments 4 diff --git a/config/packages/yt-dlp/default.nix b/config/packages/yt-dlp/default.nix new file mode 100644 index 0000000..e89916e --- /dev/null +++ b/config/packages/yt-dlp/default.nix @@ -0,0 +1,3 @@ +{ + home.file."/home/vylpes/.config/yt-dlp/config".source = ./config; +} diff --git a/system/shared.nix b/system/shared.nix index 6bd3de5..5105a21 100644 --- a/system/shared.nix +++ b/system/shared.nix @@ -114,10 +114,6 @@ gcm = "git commit -m"; gco = "git checkout"; - yt-mp3 = "yt-dlp -xi --audio-format mp3"; - yt-mp3-meta = "yt-dlp -xi --audio-format mp3 --parse-metadata \"playlist_index:%(track_number)s\" --add-metadata"; - yt-mp3-meta-cookies = "yt-dlp -xi --audio-format mp3 --parse-metadata \"playlist_index:%(track_number)s\" --add-metadata --cookies-from-browser firefox"; - s = "swallow"; }; }; From 1bd31d7e445c23e81f8d9ebeba8c9faac129cdd9 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Mon, 28 Oct 2024 17:34:07 +0000 Subject: [PATCH 4/5] Install dolphin-emu --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index 5a2aba2..4622606 100644 --- a/config/home.nix +++ b/config/home.nix @@ -48,6 +48,7 @@ in { curl dbeaver-bin discord + dolphin-emu dotnet-sdk_8 dotnetPackages.Nuget dunst From 4f2cbd4c137921a064f2e4a798a89c2e736d44f2 Mon Sep 17 00:00:00 2001 From: Ethan Lane Date: Tue, 29 Oct 2024 19:46:24 +0000 Subject: [PATCH 5/5] Install ffmpeg --- config/home.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/config/home.nix b/config/home.nix index 4622606..f4c84da 100644 --- a/config/home.nix +++ b/config/home.nix @@ -53,6 +53,7 @@ in { dotnetPackages.Nuget dunst easytag + ffmpeg firefox flac flameshot