maik/Arch-Hyprland
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #59 from JaKooLit/development

Browse Source 
updated SDDM scripts. Regarding custom theme
This commit is contained in:
Ja.KooLit
2024-04-26 09:28:49 +09:00
committed by GitHub
parent c73c155a79 77192cd06e
commit 2154eef613
2 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOGS.md
View File

@@ -1,5 +1,8 @@
## Changelogs ## Changelogs
## 26 Apr 2024
- Updated sddm.sh for Qt6 variant
## 23 Apr 2024 ## 23 Apr 2024
- Dropping swayidle and swaylock in favor of hypridle and hyprlock - Dropping swayidle and swaylock in favor of hypridle and hyprlock

34
install-scripts/sddm.sh
View File

@@ -6,11 +6,11 @@ if [[ $USE_PRESET = [Yy] ]]; then
fi fi
sddm=( sddm=(
qt5-graphicaleffects qt6-5compat
qt5-quickcontrols2 qt6-declarative
qt5-svg qt6-svg
sddm sddm
) )
## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ## ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
@@ -57,27 +57,25 @@ sudo cp assets/hyprland.desktop "$wayland_sessions_dir/" 2>&1 | tee -a "$LOG"
# SDDM-themes # SDDM-themes
valid_input=false valid_input=false
while [ "$valid_input" != true ]; do while [ "$valid_input" != true ]; do
if [[ -z $install_sddm_theme ]]; then read -n 1 -r -p "${CAT} OPTIONAL - Would you like to install SDDM themes? (y/n)" install_sddm_theme
read -n 1 -r -p "${CAT} OPTIONAL - Would you like to install SDDM themes? (y/n)" install_sddm_theme
fi
if [[ $install_sddm_theme =~ ^[Yy]$ ]]; then if [[ $install_sddm_theme =~ ^[Yy]$ ]]; then
printf "\n%s - Installing Simple SDDM Theme\n" "${NOTE}" printf "\n%s - Installing Simple SDDM Theme\n" "${NOTE}"
# Check if /usr/share/sddm/themes/simple-sddm exists and remove if it does # Check if /usr/share/sddm/themes/simple-sddm exists and remove if it does
if [ -d "/usr/share/sddm/themes/simple-sddm" ]; then if [ -d "/usr/share/sddm/themes/simple-sddm-2" ]; then
sudo rm -rf "/usr/share/sddm/themes/simple-sddm" sudo rm -rf "/usr/share/sddm/themes/simple-sddm-2"
echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory." 2>&1 | tee -a "$LOG" echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm-2' directory." 2>&1 | tee -a "$LOG"
fi fi
# Check if simple-sddm directory exists in the current directory and remove if it does # Check if simple-sddm directory exists in the current directory and remove if it does
if [ -d "simple-sddm" ]; then if [ -d "simple-sddm-2" ]; then
rm -rf "simple-sddm" rm -rf "simple-sddm-2"
echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm' directory from the current location." 2>&1 | tee -a "$LOG" echo -e "\e[1A\e[K${OK} - Removed existing 'simple-sddm-2' directory from the current location." 2>&1 | tee -a "$LOG"
fi fi
if git clone https://github.com/JaKooLit/simple-sddm.git; then if git clone https://github.com/JaKooLit/simple-sddm-2.git; then
while [ ! -d "simple-sddm" ]; do while [ ! -d "simple-sddm-2" ]; do
sleep 1 sleep 1
done done
if [ ! -d "/usr/share/sddm/themes" ]; then if [ ! -d "/usr/share/sddm/themes" ]; then
@@ -85,8 +83,8 @@ while [ "$valid_input" != true ]; do
echo -e "\e[1A\e[K${OK} - Directory '/usr/share/sddm/themes' created." 2>&1 | tee -a "$LOG" echo -e "\e[1A\e[K${OK} - Directory '/usr/share/sddm/themes' created." 2>&1 | tee -a "$LOG"
fi fi
sudo mv simple-sddm /usr/share/sddm/themes/ sudo mv simple-sddm-2 /usr/share/sddm/themes/
echo -e "[Theme]\nCurrent=simple-sddm" | sudo tee "$sddm_conf_dir/10-theme.conf" &>> "$LOG" echo -e "[Theme]\nCurrent=simple-sddm-2" | sudo tee "$sddm_conf_dir/10-theme.conf" &>> "$LOG"
else else
echo -e "\e[1A\e[K${ERROR} - Failed to clone the theme repository. Please check your internet connection" | tee -a "$LOG" >&2 echo -e "\e[1A\e[K${ERROR} - Failed to clone the theme repository. Please check your internet connection" | tee -a "$LOG" >&2
fi fi