From aff9caf3da8b7da8970df81378472db553974b83 Mon Sep 17 00:00:00 2001
From: Mylloon <kennel.anri@tutanota.com>
Date: Thu, 7 Mar 2024 17:15:54 +0100
Subject: [PATCH] spotify stuff

---
 .config/fish/conf.d/abbr_arch.fish  | 2 +-
 arch.sh                             | 5 +++--
 archinstall/user_configuration.json | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.config/fish/conf.d/abbr_arch.fish b/.config/fish/conf.d/abbr_arch.fish
index d4d44c0..afe5dc5 100644
--- a/.config/fish/conf.d/abbr_arch.fish
+++ b/.config/fish/conf.d/abbr_arch.fish
@@ -3,7 +3,7 @@ abbr d "nautilus . -w &> /dev/null & disown"
 abbr vs "codium ."
 # abbr vencord-installer 'yes | sh -c "$(curl -sS https://raw.githubusercontent.com/Vendicated/VencordInstaller/main/install.sh)"'
 abbr xclip "xclip -selection clipboard"
-abbr spotx "bash -c 'bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Linux/main/install.sh) -ceP $HOME/.local/share/spotify-launcher/install/usr/share/spotify/'"
+abbr spotx "bash -c 'bash <(curl -sSL https://spotx-official.github.io/run.sh) -ce'"
 abbr rm "trash -f"
 abbr catall "find . -name '*.ext1' -o -name '*.ext2' | xargs cat | xclip -selection clipboard"
 abbr ls "eza --git --icons -gl"
diff --git a/arch.sh b/arch.sh
index 5a437a9..4b845f7 100644
--- a/arch.sh
+++ b/arch.sh
@@ -52,7 +52,7 @@ main() {
     obsidian parsec-bin evolution-etesync-git x11-emoji-picker cram \
     gnome-shell-extension-dash-to-dock gnome-shell-extension-desktop-icons-ng \
     dracula-gtk-theme dracula-icons-git vscodium-bin otf-symbola touchegg \
-    gnome-shell-extension-nightthemeswitcher spotify-launcher nerd-fonts-meslo \
+    gnome-shell-extension-nightthemeswitcher nerd-fonts-meslo \
     gnome-shell-extension-x11gestures gnome-shell-extension-no-overview \
     gnome-shell-extension-gsconnect gnome-shell-extension-tiling-assistant \
     gnome-shell-extension-rounded-window-corners topgrade-bin ufw-docker \
@@ -162,7 +162,8 @@ main() {
   mv completions_fish ~/.config/fish/completions/tldr.fish
 
   # === Spotify ==
-  bash <(curl -sSL https://raw.githubusercontent.com/SpotX-CLI/SpotX-Linux/main/install.sh) -ceP "$HOME"/.local/share/spotify-launcher/install/usr/share/spotify
+  # is `spotify-launcher --force-update` needed before patching?
+  bash <(curl -sSL https://spotx-official.github.io/run.sh) -ce
 
   # === Syncthing ==
   systemctl enable syncthing@"$USER".service
diff --git a/archinstall/user_configuration.json b/archinstall/user_configuration.json
index d3f7076..646fdc7 100644
--- a/archinstall/user_configuration.json
+++ b/archinstall/user_configuration.json
@@ -139,7 +139,8 @@
     "perl-yaml-tiny",
     "perl-file-homedir",
     "perl-file-which",
-    "clamav"
+    "clamav",
+    "spotify-launcher"
   ],
   "plugin": null,
   "profile": {