From 3299ed3938dc6ab9d95de047e3afc25bf1aa920a Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Mon, 28 Nov 2022 16:01:51 +0100
Subject: [PATCH] change spotify patch

---
 .local/share/applications/spotify.desktop | 11 -----------
 arch.sh                                   | 22 +++-------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 .local/share/applications/spotify.desktop

diff --git a/.local/share/applications/spotify.desktop b/.local/share/applications/spotify.desktop
deleted file mode 100644
index 4ffb153..0000000
--- a/.local/share/applications/spotify.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Spotify (sans pubs)
-GenericName=Music Player
-Icon=spotify-client
-TryExec=spotify
-Exec=env LD_PRELOAD=/usr/local/lib/spotify-adblock.so spotify --uri=%U
-Terminal=false
-MimeType=x-scheme-handler/spotify;
-Categories=Audio;Music;Player;AudioVideo;
-StartupWMClass=spotify
diff --git a/arch.sh b/arch.sh
index b855c17..10623a5 100644
--- a/arch.sh
+++ b/arch.sh
@@ -35,7 +35,7 @@ main() {
     yay -Y --devel --save
 
     # === AUR packages ==
-    yay -S --noconfirm spotify obsidian parsec-bin onlyoffice-bin \
+    yay -S --noconfirm spotify-dev obsidian parsec-bin onlyoffice-bin \
                        x11-emoji-picker-git gnome-shell-extension-dash-to-dock \
                        gnome-shell-extension-desktop-icons-ng dracula-gtk-theme \
                        dracula-icons-git vscodium-bin ttf-symbola \
@@ -201,24 +201,8 @@ main() {
     wget -q --show-progress "$url_tldr" -O completions_fish
     mv completions_fish ~/.config/fish/completions/tldr.fish
 
-    # === Spotify no-ads mod ==
-    git clone https://github.com/abba23/spotify-adblock.git
-    cd spotify-adblock || exit
-    make
-    make install
-    cd ..
-    rm -rf spotify-adblock
-    # Remove banner and upgrade button
-    cd "$(dirname "$(realpath -L "$(which spotify)")")"/Apps || exit # absolute path to Spotify
-    unzip xpui.spa xpui.js -d .
-    sed -i "s/adsEnabled:!0/adsEnabled:!1/" xpui.js # disable empty ad block (banner)
-    sed -i "s/.\>\=1024/ 1!=1 /" xpui.js # disable Upgrade Buton
-    sed -i "s/((?:\"a\"))\S+noopener nofollow.+?,.)/\$1/" xpui.js # disable Premium NavLink button
-    zip --update xpui.spa xpui.js
-    rm xpui.js
-    cd - > /dev/null || exit
-    # Add desktop shortcut
-    wget -q --show-progress https://git.kennel.ml/Anri/confOS/raw/branch/main/.local/share/applications/spotify.desktop -P "$HOME"/.local/share/applications/
+    # === Spotify ==
+    bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Linux/main/install.sh) -ce
 
     # === Syncthing ==
     systemctl enable syncthing@"$USER".service