From b769dbbcb0dd5e8b79b24e6473345b4bab3241dc Mon Sep 17 00:00:00 2001
From: exu <mrc@frm01.net>
Date: Fri, 1 Mar 2024 23:18:21 +0100
Subject: [PATCH] Switch to "sweet-folders-icons-git" for Sweet theme

---
 arch-config/.config/gtk-3.0/settings.ini         | 2 +-
 arch-config/.gtkrc-2.0                           | 3 ++-
 arch-config/etc/lightdm/lightdm-gtk-greeter.conf | 2 +-
 arch-config/scripts/gsettings.sh                 | 2 +-
 arch-setup/packages/theme-packages.txt           | 4 +---
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/arch-config/.config/gtk-3.0/settings.ini b/arch-config/.config/gtk-3.0/settings.ini
index 4ae95444..c9de9e89 100644
--- a/arch-config/.config/gtk-3.0/settings.ini
+++ b/arch-config/.config/gtk-3.0/settings.ini
@@ -1,5 +1,5 @@
 [Settings]
-gtk-theme-name=Sweet-Dark
+gtk-theme-name=sweet
 gtk-application-prefer-dark-theme = true
 gtk-icon-theme-name=Sweet-Rainbow
 gtk-font-name=Fira Sans 12
diff --git a/arch-config/.gtkrc-2.0 b/arch-config/.gtkrc-2.0
index ce2c4eb6..c08b24cf 100755
--- a/arch-config/.gtkrc-2.0
+++ b/arch-config/.gtkrc-2.0
@@ -1,7 +1,8 @@
 # DO NOT EDIT! This file will be overwritten by LXAppearance.
 # Any customization should be done in ~/.gtkrc-2.0.mine instead.
 
-gtk-theme-name="Sweet-Dark"
+gtk-theme-name="sweet"
+gtk-application-prefer-dark-theme=true
 gtk-icon-theme-name="Sweet-Rainbow"
 gtk-font-name="Fira Sans 12"
 gtk-cursor-theme-name="capitaine-cursors-light"
diff --git a/arch-config/etc/lightdm/lightdm-gtk-greeter.conf b/arch-config/etc/lightdm/lightdm-gtk-greeter.conf
index 30d009d3..9ba22672 100644
--- a/arch-config/etc/lightdm/lightdm-gtk-greeter.conf
+++ b/arch-config/etc/lightdm/lightdm-gtk-greeter.conf
@@ -1,5 +1,5 @@
 [greeter]
-theme-name = Sweet-Dark
+theme-name = sweet
 icon-theme-name = Sweet-Rainbow
 font-name = Fira Sans 11
 background = /usr/share/backgrounds/custom/artstation_14224733_55806391_月半与鬼哭.jpg
diff --git a/arch-config/scripts/gsettings.sh b/arch-config/scripts/gsettings.sh
index 19d32653..6dd25453 100755
--- a/arch-config/scripts/gsettings.sh
+++ b/arch-config/scripts/gsettings.sh
@@ -3,7 +3,7 @@
 set -euo pipefail
 
 # set GTK theme
-gsettings set org.gnome.desktop.interface gtk-theme Sweet-Dark
+gsettings set org.gnome.desktop.interface gtk-theme sweet
 # prefer dark variant
 gsettings set org.gnome.desktop.interface color-scheme prefer-dark
 
diff --git a/arch-setup/packages/theme-packages.txt b/arch-setup/packages/theme-packages.txt
index 94582f2d..fc5356f0 100644
--- a/arch-setup/packages/theme-packages.txt
+++ b/arch-setup/packages/theme-packages.txt
@@ -1,13 +1,11 @@
 breeze
 breeze-icons
-candy-icons-git
 capitaine-cursors
 kvantum
 kwindowsystem5
 lxappearance
+plasma5-themes-sweet-full-git
 qt5ct
 qt6ct
 sardi-icons
 surfn-icons-git
-sweet-folders-icons-git
-sweet-gtk-theme-dark