From 5da5231276782e2880b35da5def63f97e2f31899 Mon Sep 17 00:00:00 2001 From: Stephan Raabe Date: Mon, 22 Apr 2024 14:46:08 +0200 Subject: [PATCH] Updates --- .install/displaymanager.sh | 10 +++--- eww/assets/application-exit-symbolic-rtl.svg | 7 ++++ eww/assets/media-playback-pause-symbolic.svg | 7 ++++ eww/assets/system-lock-screen-symbolic.svg | 4 +++ eww/assets/system-reboot-symbolic.svg | 4 +++ eww/assets/system-shutdown-symbolic.svg | 4 +++ eww/assets/window-close-symbolic.svg | 4 +++ eww/ml4w-sidebar/eww.scss | 31 ++++++------------ eww/ml4w-sidebar/eww.yuck | 34 +++++++++++++++++--- eww/ml4w-sidebar/launch.sh | 4 +-- eww/scripts/eww.sh | 3 ++ 11 files changed, 79 insertions(+), 33 deletions(-) create mode 100644 eww/assets/application-exit-symbolic-rtl.svg create mode 100644 eww/assets/media-playback-pause-symbolic.svg create mode 100644 eww/assets/system-lock-screen-symbolic.svg create mode 100644 eww/assets/system-reboot-symbolic.svg create mode 100644 eww/assets/system-shutdown-symbolic.svg create mode 100644 eww/assets/window-close-symbolic.svg create mode 100755 eww/scripts/eww.sh diff --git a/.install/displaymanager.sh b/.install/displaymanager.sh index 4ea9791..5948379 100755 --- a/.install/displaymanager.sh +++ b/.install/displaymanager.sh @@ -30,25 +30,25 @@ if [ ! -d ~/dotfiles ];then disman=0 echo "You have already installed a display manager on your system." echo "How do you want to proceed?" - dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm") + dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm and theme") else disman=1 echo "There is no display manager installed on your system." echo "After the installation/update of the dotfiles, you can start Hyprland with command Hyprland and Qtile with commmand Qtile (or startx)." echo "How do you want to proceed?" - dmsel=$(gum choose "Keep current setup" "Install sddm") + dmsel=$(gum choose "Keep current setup" "Install sddm and theme") fi else if [ -f /etc/systemd/system/display-manager.service ]; then disman=0 echo "You have already installed a display manager. If your display manager is working fine, you can keep the current setup." echo "How do you want to proceed?" - dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm") + dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm and theme") else disman=1 echo "There is no display manager installed on your system. You're starting Hyprland/Qtile with commands on tty." echo "How do you want to proceed?" - dmsel=$(gum choose "Keep current setup" "Install sddm") + dmsel=$(gum choose "Keep current setup" "Install sddm and theme") fi fi @@ -56,7 +56,7 @@ if [ -z "${dmsel}" ] ;then echo "Installation canceled." exit fi -if [ "$dmsel" == "Install sddm" ] ;then +if [ "$dmsel" == "Install sddm and theme" ] ;then disman=0 # Try to force the installation of sddm diff --git a/eww/assets/application-exit-symbolic-rtl.svg b/eww/assets/application-exit-symbolic-rtl.svg new file mode 100644 index 0000000..89f0825 --- /dev/null +++ b/eww/assets/application-exit-symbolic-rtl.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eww/assets/media-playback-pause-symbolic.svg b/eww/assets/media-playback-pause-symbolic.svg new file mode 100644 index 0000000..39383da --- /dev/null +++ b/eww/assets/media-playback-pause-symbolic.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/eww/assets/system-lock-screen-symbolic.svg b/eww/assets/system-lock-screen-symbolic.svg new file mode 100644 index 0000000..78a410a --- /dev/null +++ b/eww/assets/system-lock-screen-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/eww/assets/system-reboot-symbolic.svg b/eww/assets/system-reboot-symbolic.svg new file mode 100644 index 0000000..15171f5 --- /dev/null +++ b/eww/assets/system-reboot-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/eww/assets/system-shutdown-symbolic.svg b/eww/assets/system-shutdown-symbolic.svg new file mode 100644 index 0000000..cfd4996 --- /dev/null +++ b/eww/assets/system-shutdown-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/eww/assets/window-close-symbolic.svg b/eww/assets/window-close-symbolic.svg new file mode 100644 index 0000000..4cd28cd --- /dev/null +++ b/eww/assets/window-close-symbolic.svg @@ -0,0 +1,4 @@ + + + + diff --git a/eww/ml4w-sidebar/eww.scss b/eww/ml4w-sidebar/eww.scss index 5f30d00..45c6c82 100644 --- a/eww/ml4w-sidebar/eww.scss +++ b/eww/ml4w-sidebar/eww.scss @@ -63,27 +63,16 @@ color: #cfb3ff; } -.powericons_logout { - font-size: 32px; - padding-left: 4px; +.powericons { + background-repeat: no-repeat; + background-size: 30px; + min-height: 30px; + min-width: 30px; } -.powericons_shutdown { - font-size: 32px; - padding-right: 9px; +.closeicon { + background-repeat: no-repeat; + background-size: 16px; + min-height: 16px; + min-width: 16px; } - -.powericons_reboot { - font-size: 32px; - padding-right: 7px; -} - -.powericons_lock { - font-size: 32px; - padding-right: 5px; -} - -.powericons_suspend { - font-size: 32px; - padding-left: 2px; -} \ No newline at end of file diff --git a/eww/ml4w-sidebar/eww.yuck b/eww/ml4w-sidebar/eww.yuck index c8f1a0a..803926d 100644 --- a/eww/ml4w-sidebar/eww.yuck +++ b/eww/ml4w-sidebar/eww.yuck @@ -1,3 +1,5 @@ +;; Icons: https://github.com/GNOME/adwaita-icon-theme/tree/master/Adwaita + ;; Variables ;; System vars @@ -59,35 +61,56 @@ ) ) +(defwidget close [] + (box :class "winbox" + (button :tooltip "Logout" :style "background-image: url('../assets/window-close-symbolic.svg');" :class "closeicon" :valign "center" :halign "center" :onclick "../scripts/eww.sh &") + ) +) + ;; powermenus (defwidget logout [] (box :class "winbox" - (button :class "powericons_logout" :valign "center" :halign "center" :onclick "../scripts/system.sh logout &" "") + (button :tooltip "Logout" :style "background-image: url('../assets/application-exit-symbolic-rtl.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh logout &") ) ) + (defwidget suspend [] (box :class "winbox" - (button :class "powericons_suspend" :valign "center" :halign "center" :onclick "../scripts/system.sh suspend &" "") + (button :tooltip "Suspend" :style "background-image: url('../assets/media-playback-pause-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh suspend &") ) ) + (defwidget lock [] (box :class "winbox" - (button :class "powericons_lock" :valign "center" :halign "center" :onclick "../scripts/system.sh lock &" "") + (button :tooltip "Lock" :style "background-image: url('../assets/system-lock-screen-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh lock &") ) ) + (defwidget reboot [] (box :class "winbox" - (button :class "powericons_reboot" :valign "center" :halign "center" :onclick "../scripts/system.sh reboot &" "") + (button :tooltip "Reboot" :style "background-image: url('../assets/system-reboot-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh reboot &") ) ) + (defwidget shutdown [] (box :class "winbox" - (button :class "powericons_shutdown" :valign "center" :halign "center" :onclick "../scripts/system.sh shutdown &" "") + (button :tooltip "Shutdown" :style "background-image: url('../assets/system-shutdown-symbolic.svg');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system.sh shutdown &") ) ) ;; ** Windows ************************************************************************* +(defwindow close + :monitor 0 + :geometry (geometry :x "455px" + :y "-7px" + :width "44px" + :height "44px" + :anchor "top right") + :stacking "fg" + :wm-ignore false +(close)) + (defwindow ml4wlauncher :monitor 0 :geometry (geometry :x "5px" @@ -166,3 +189,4 @@ :stacking "fg" :wm-ignore false (shutdown)) + diff --git a/eww/ml4w-sidebar/launch.sh b/eww/ml4w-sidebar/launch.sh index ed0d930..a3cb277 100755 --- a/eww/ml4w-sidebar/launch.sh +++ b/eww/ml4w-sidebar/launch.sh @@ -10,8 +10,8 @@ fi if [[ ! -f "$FILE" ]]; then touch "$FILE" - ${EWW} --config "$CFG" open-many ml4wlauncher resources logout suspend lock reboot shutdown + ${EWW} --config "$CFG" open-many ml4wlauncher resources logout suspend lock reboot shutdown close else - ${EWW} --config "$CFG" close resources ml4wlauncher logout suspend lock reboot shutdown + ${EWW} --config "$CFG" close resources ml4wlauncher logout suspend lock reboot shutdown close rm "$FILE" fi \ No newline at end of file diff --git a/eww/scripts/eww.sh b/eww/scripts/eww.sh new file mode 100755 index 0000000..a13b895 --- /dev/null +++ b/eww/scripts/eww.sh @@ -0,0 +1,3 @@ +#!/bin/bash +sleep 0.3 +$HOME/dotfiles/eww/ml4w-sidebar/launch.sh \ No newline at end of file