From c5269f51f3b945d6b1f97cd8a0aa5541174cfc80 Mon Sep 17 00:00:00 2001 From: Dmitry Voronin Date: Mon, 7 Oct 2024 10:42:23 +0300 Subject: [PATCH] Remove Yandex services & bookmarks. --- home/program/firefox/default.nix | 3 +- host/x86_64-linux/home/Container.nix | 2 +- host/x86_64-linux/home/YaMusicDownload.nix | 49 ---------------------- package/default.nix | 1 - package/yamusicdownload/default.nix | 22 ---------- 5 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 host/x86_64-linux/home/YaMusicDownload.nix delete mode 100644 package/yamusicdownload/default.nix diff --git a/home/program/firefox/default.nix b/home/program/firefox/default.nix index 7746d7e..da4bb6b 100644 --- a/home/program/firefox/default.nix +++ b/home/program/firefox/default.nix @@ -102,7 +102,7 @@ in { ManagedBookmarks = [ { toplevel_name = "Pin"; } (mkBookmark "Dashboard" "https://home.voronind.com") - (mkBookmark "Music" "https://music.yandex.ru") + (mkBookmark "Watch" "https://watch.voronind.com") (mkBookmark "Telegram" "https://web.telegram.org/a") (mkBookmark "Discord" "https://discord.com") (mkBookmark "Mail" "https://mail.voronind.com") @@ -112,7 +112,6 @@ in { (mkBookmark "WorkBoard" "https://support.fsight.ru") (mkBookmark "Hass" "https://iot.voronind.com") (mkBookmark "Cloud" "https://cloud.voronind.com") - (mkBookmark "Watch" "https://watch.voronind.com") ]; ExtensionUpdate = true; ExtensionSettings = { diff --git a/host/x86_64-linux/home/Container.nix b/host/x86_64-linux/home/Container.nix index 49cd6aa..32f37a0 100644 --- a/host/x86_64-linux/home/Container.nix +++ b/host/x86_64-linux/home/Container.nix @@ -45,7 +45,7 @@ download = [ "/storage/hot/download" ]; manga = [ "/storage/cold_1/manga" "/storage/cold_2/manga" ]; movie = [ "/storage/cold_1/movie" "/storage/cold_2/movie" ]; - music = [ "/storage/cold_2/music" "/storage/hot/music" ]; + music = [ "/storage/cold_2/music" ]; paper = [ "/storage/hot/paper" ]; porn = [ "/storage/cold_2/porn" ]; photo = [ "/storage/hot/container/cloud/data/data/cakee/files/photo" "/storage/cold_1/backup/tmp/photo" ]; diff --git a/host/x86_64-linux/home/YaMusicDownload.nix b/host/x86_64-linux/home/YaMusicDownload.nix deleted file mode 100644 index 4e23377..0000000 --- a/host/x86_64-linux/home/YaMusicDownload.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ pkgs, util, lib, __findFile, ... }: let - storage = "/storage/hot/music"; - package = import { inherit pkgs; }; - pattern = "#album-artist/#year_#album/#number_#title"; -in { - systemd.user = { - services.yamusicdownload = let - script = pkgs.writeText "YaMusicDownloadScript" (util.trimTabs '' - [[ $UID = 0 ]] && exit 0 - - function notify_silent() { - curl -X POST -H 'Content-Type: Application/json' -d "{\"chat_id\":\"155897358\",\"text\":\"$1\",\"disable_notification\":\"true\"}" https://api.telegram.org/bot2046849441:AAHQpjRK4xpL8tEUyN4JTSDUUze4J0wSIy4/sendMessage &> /dev/null - } - - cd ${storage} - - output=$(${package}/bin/yandex-music-downloader --browser "firefox" --hq --add-lyrics --embed-cover --skip-existing --stick-to-artist --only-music --path-pattern "${pattern}" --url https://music.yandex.ru/users/cakee.ru/playlists/3) - - if [[ $? = 0 ]]; then - notify_silent "Music download complete: ''${output}" - else - notify_silent "Music download failed. Capcha?" - fi - ''); - in util.mkStaticSystemdService { - enable = true; - description = "Yandex Music Download."; - serviceConfig = { - Type = "oneshot"; - ExecStart = "-${lib.getExe pkgs.bashInteractive} ${script}"; - Restart = "on-failure"; - }; - path = with pkgs; [ - curl - firefox-esr - python313 - ]; - }; - - timers.yamusicdownload = { - timerConfig = { - OnCalendar = "daily"; - Persistent = true; - Unit = "yamusicdownload.service"; - }; - wantedBy = [ "default.target" ]; - }; - }; -} diff --git a/package/default.nix b/package/default.nix index 998d9c5..6c785bf 100644 --- a/package/default.nix +++ b/package/default.nix @@ -84,7 +84,6 @@ onlyoffice-bin # Office documents app suite. (mpv.override { scripts = [ mpvScripts.mpris ]; }) # Media player. - (pkgs.callPackage ./yamusicdownload {}) ]; gaming = with pkgs; [ diff --git a/package/yamusicdownload/default.nix b/package/yamusicdownload/default.nix deleted file mode 100644 index b41f7e8..0000000 --- a/package/yamusicdownload/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ pkgs, ... }: with pkgs.python3Packages; buildPythonPackage { - version = "1.0.0"; - pname = "yandex-music-downloader"; - format = "pyproject"; - - propagatedBuildInputs = [ - setuptools - setuptools-git - requests - eyed3 - browser-cookie3 - ]; - - src = pkgs.fetchFromGitHub { - owner = "llistochek"; - repo = "yandex-music-downloader"; - rev = "08ea384869cbc31efb1e78b831e2356882219951"; - hash = "sha256-WOFesD7HjskyqHaXZAPy3pgSPaEO+tOyQ+5MV3ZO7XU="; - }; - - meta.mainProgram = "yandex-music-downloader"; -}