diff --git a/maddie/common/yt-dlp.nix b/maddie/common/yt-dlp.nix index 6d95ddf..f5d31ca 100644 --- a/maddie/common/yt-dlp.nix +++ b/maddie/common/yt-dlp.nix @@ -2,6 +2,9 @@ { programs.yt-dlp.enable = true; + home.packages = with pkgs; [ + flac + ]; home.file.".local/bin/ytdlp-music" = { source = ./yt-dlp/ytdlp-music.sh; diff --git a/maddie/common/yt-dlp/ytdlp-music.sh b/maddie/common/yt-dlp/ytdlp-music.sh index 01a0933..7128ada 100755 --- a/maddie/common/yt-dlp/ytdlp-music.sh +++ b/maddie/common/yt-dlp/ytdlp-music.sh @@ -1,6 +1,24 @@ #!/usr/bin/env sh -echo "Name:" && read name -echo "URL:" && read url +printf "YT URL: " && read url +printf "Title: " && read title +printf "Artist: " && read artist -yt-dlp -x --no-playlist --embed-thumbnail --no-embed-metadata --audio-quality 0 --audio-format flac -o "$name" "$url" +# Download file from youtube +yt-dlp -x --no-playlist --embed-thumbnail --no-embed-metadata --audio-quality 0 --audio-format flac -o "$title.flac" "$url" + +# Set metadata flags +metaflac --set-tag="TITLE=$title" --set-tag="ARTIST=$artist" "$title.flac" + +# Export thumbnail +metaflac --export-picture-to="$title.png" "$title.flac" + +# Convert png to jpg +mogrify -format jpg "$title.png" +rm -rf "$title.png" + +# Convert to square +convert "$title.jpg" -gravity center -crop 1:1 "$title.jpg" + +# Move the files to the correct directory +mv "$title.flac" "$title.jpg" $HOME/Music/iPod diff --git a/systems/mdesktop/boot.nix b/systems/mdesktop/boot.nix index cfc1fcb..9ccad04 100644 --- a/systems/mdesktop/boot.nix +++ b/systems/mdesktop/boot.nix @@ -7,11 +7,20 @@ ]; # Setup bootloader - boot.loader.systemd-boot.enable = true; + boot.loader.systemd-boot = { + enable = true; + consoleMode = "max"; + }; boot.loader.efi.canTouchEfiVariables = true; boot.loader.efi.efiSysMountPoint = "/boot/efi"; boot.initrd.systemd.enable = true; + # Plymouth + boot.plymouth = { + enable = true; + #logo = ./plymouth/logo.png; + }; + # Setup crypto keyfile boot.initrd.secrets = { "/crypto_keyfile.bin" = null; diff --git a/systems/mdesktop/fonts.nix b/systems/mdesktop/fonts.nix index 14951cd..4c18ac6 100644 --- a/systems/mdesktop/fonts.nix +++ b/systems/mdesktop/fonts.nix @@ -4,6 +4,7 @@ fonts.packages = with pkgs; [ nerdfonts font-awesome + source-sans source-han-sans source-han-serif source-han-code-jp diff --git a/systems/mdesktop/plymouth/logo.png b/systems/mdesktop/plymouth/logo.png new file mode 100644 index 0000000..8ddb015 Binary files /dev/null and b/systems/mdesktop/plymouth/logo.png differ