From 9033dbf59bcdc17f90200530d605bafd776f232e Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Wed, 20 Dec 2023 20:55:30 +0100 Subject: [PATCH] sddm updates --- .install/displaymanager.sh | 2 +- .install/hyprland-packages.sh | 2 +- .install/profile.sh | 2 +- .install/qtile-packages.sh | 4 ++-- sddm/sddm.conf | 3 +-- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.install/displaymanager.sh b/.install/displaymanager.sh index 5381094..bfe89f2 100755 --- a/.install/displaymanager.sh +++ b/.install/displaymanager.sh @@ -2,7 +2,6 @@ # Disable display manager # ------------------------------------------------------ disman=0 -profile="Hyprland" echo -e "${GREEN}" cat <<"EOF" ____ _ _ __ __ @@ -26,6 +25,7 @@ fi if [[ $profile == *"Qtile"* ]]; then if [ -f /usr/share/wayland-sessions/qtile-wayland.desktop ]; then sudo mv /usr/share/wayland-sessions/qtile-wayland.desktop /usr/share/wayland-sessions/qtile-wayland.bak + echo "Qtile Wayland Session removed." fi echo "PLEASE NOTE: Qtile works with Display Managers." echo "But if you want to use the tty based (terminal) login instead, you can disable the display manager now." diff --git a/.install/hyprland-packages.sh b/.install/hyprland-packages.sh index de6ae8f..17cfa5d 100644 --- a/.install/hyprland-packages.sh +++ b/.install/hyprland-packages.sh @@ -44,7 +44,6 @@ packagesPacman=( "brightnessctl" "gum" "man-pages" - "sddm" ); packagesYay=( @@ -57,5 +56,6 @@ packagesYay=( "wlogout" "wlr-randr" "pacseek" + "sddm-git" "sddm-sugar-candy-git" ); diff --git a/.install/profile.sh b/.install/profile.sh index 894368b..3ffe68c 100755 --- a/.install/profile.sh +++ b/.install/profile.sh @@ -18,4 +18,4 @@ profile=$(gum choose --no-limit --cursor-prefix "( ) " --selected-prefix "(x) " if [ -z $profile ] ;then echo "No profile selected. Installation canceled." exit -fi \ No newline at end of file +fi diff --git a/.install/qtile-packages.sh b/.install/qtile-packages.sh index 71855cb..0e8a0c2 100644 --- a/.install/qtile-packages.sh +++ b/.install/qtile-packages.sh @@ -48,7 +48,6 @@ packagesPacman=( "xorg" "xorg-xinit" "man-pages" - "sddm" ); packagesYay=( @@ -60,5 +59,6 @@ packagesYay=( "qtile-extras" "wlr-randr" "pacseek" - "sddm-sugar-candy-git" + "sddm-git" + "sddm-sugar-candy-git" ); diff --git a/sddm/sddm.conf b/sddm/sddm.conf index b80333e..ec96054 100644 --- a/sddm/sddm.conf +++ b/sddm/sddm.conf @@ -8,11 +8,10 @@ Session= # Username for autologin session User= - [General] # Which display server should be used. # Valid values are: x11, x11-user, wayland. Wayland support is experimental -DisplayServer=wayland +DisplayServer=x11 # Comma-separated list of environment variables to be set GreeterEnvironment=