From 168df975c4e2fc78636662a574320c5c6f6a8526 Mon Sep 17 00:00:00 2001 From: Henrik Bakken Date: Wed, 14 May 2025 23:27:01 +0200 Subject: [PATCH] gtkgreet -> qtgreet, gtklock -> swaylock-effects --- ROOT/etc/greetd/gtkgreet.css | 10 -------- ROOT/etc/qtgreet/config.ini | 23 +++++++++++++++++++ custom-droneship/ROOT/etc/greetd/sway-config | 12 ++++++++++ .../ROOT}/etc/greetd/sway-config | 6 +++-- manjaro.sh | 2 +- sway/config | 4 ++-- 6 files changed, 42 insertions(+), 15 deletions(-) delete mode 100644 ROOT/etc/greetd/gtkgreet.css create mode 100644 ROOT/etc/qtgreet/config.ini create mode 100644 custom-droneship/ROOT/etc/greetd/sway-config rename {ROOT => custom-mothership/ROOT}/etc/greetd/sway-config (70%) diff --git a/ROOT/etc/greetd/gtkgreet.css b/ROOT/etc/greetd/gtkgreet.css deleted file mode 100644 index 590563c..0000000 --- a/ROOT/etc/greetd/gtkgreet.css +++ /dev/null @@ -1,10 +0,0 @@ -window { - background-image: url("file:///usr/share/backgrounds/default.png"); - background-size: cover; - background-position: center; -} - -box#body { - border-radius: 20px; - padding: 50px; -} diff --git a/ROOT/etc/qtgreet/config.ini b/ROOT/etc/qtgreet/config.ini new file mode 100644 index 0000000..bc53e5c --- /dev/null +++ b/ROOT/etc/qtgreet/config.ini @@ -0,0 +1,23 @@ +[General] +Backend = GreetD +Theme = aerial +BlurBackground = true +IconTheme = breeze + +[Overrides] +Background = Theme +BaseColor = Theme +TextColor = Theme +FontFamily = Theme + +[videobg] +File = +Playlist = + +[Environment] + +[PowerCommands] +Suspend = dbus +Hibernate = dbus +Shutdown = dbus +Reboot = dbus diff --git a/custom-droneship/ROOT/etc/greetd/sway-config b/custom-droneship/ROOT/etc/greetd/sway-config new file mode 100644 index 0000000..0257511 --- /dev/null +++ b/custom-droneship/ROOT/etc/greetd/sway-config @@ -0,0 +1,12 @@ +# `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. +exec "qtgreet; swaymsg exit" + +bindsym Mod4+shift+e exec swaynag \ +-t warning \ +-m 'What do you want to do?' \ +-b 'Poweroff' 'sudo poweroff' \ +-b 'Reboot' 'sudo reboot' + +output DP-0 resolution 2560x1440 position 0 0 + +# include /etc/sway/config.d/* diff --git a/ROOT/etc/greetd/sway-config b/custom-mothership/ROOT/etc/greetd/sway-config similarity index 70% rename from ROOT/etc/greetd/sway-config rename to custom-mothership/ROOT/etc/greetd/sway-config index 149b878..cb448b2 100644 --- a/ROOT/etc/greetd/sway-config +++ b/custom-mothership/ROOT/etc/greetd/sway-config @@ -1,5 +1,5 @@ # `-l` activates layer-shell mode. Notice that `swaymsg exit` will run after gtkgreet. -exec "gtkgreet -l -s /etc/greetd/gtkgreet.css; swaymsg exit" +exec "qtgreet; swaymsg exit" bindsym Mod4+shift+e exec swaynag \ -t warning \ @@ -7,4 +7,6 @@ bindsym Mod4+shift+e exec swaynag \ -b 'Poweroff' 'sudo poweroff' \ -b 'Reboot' 'sudo reboot' -include /etc/sway/config.d/* +output DP-1 resolution 5120x1440 + +# include /etc/sway/config.d/* diff --git a/manjaro.sh b/manjaro.sh index 67bebc1..bac1e72 100755 --- a/manjaro.sh +++ b/manjaro.sh @@ -7,7 +7,7 @@ sudo systemctl enable --now fstrim.timer yay -S plymouth tldextract go nodejs unzip exa topgrade # display manager -yay -S greetd gtkgreet +yay -S greetd qtgreet # sway yay -S manjaro-sway-settings swaytools swaylock pamac-tray-plasma unipicker mako ly wlsunset pcmanfm-qt wev gtklock diff --git a/sway/config b/sway/config index eda40c0..e96daa0 100644 --- a/sway/config +++ b/sway/config @@ -27,7 +27,7 @@ set $script_path /usr/share/sway/scripts set $term footclient set $term_float footclient --app-id floating_shell --window-size-chars 120x45 # swayidle -set $locking gtklock --daemonize --follow-focus --idle-hide --start-hidden -s /etc/greetd/gtkgreet.css +set $locking swaylock --screenshots --clock --grace 10 --fade-in 0.5 --effect-blur 5x5 --effect-greyscale # scaling set $scale_up $script_path/scale.sh up set $scale_down $script_path/scale.sh down @@ -217,7 +217,7 @@ mode "$mode_system" { bindsym s exec --no-startup-id systemctl suspend, mode "default" bindsym r exec --no-startup-id systemctl reboot, mode "default" bindsym p exec --no-startup-id systemctl poweroff -i, mode "default" - bindsym l exec --no-startup-id swaylock -e -f -c 000000 -t, mode "default" + bindsym l exec --no-startup-id $locking, mode "default" bindsym Return mode "default" bindsym Escape mode "default"