diff --git a/.install/packages/hyprland-packages.sh b/.install/packages/hyprland-packages.sh
index acf57d0..35c57dc 100644
--- a/.install/packages/hyprland-packages.sh
+++ b/.install/packages/hyprland-packages.sh
@@ -16,4 +16,5 @@ packagesYay=(
"wlogout"
"nwg-look"
"emote"
+ "eww"
);
diff --git a/.version/name b/.version/name
index ae01545..44fcfe5 100644
--- a/.version/name
+++ b/.version/name
@@ -1 +1 @@
-2.9BETA2
\ No newline at end of file
+2.9BETA3
\ No newline at end of file
diff --git a/apps/ML4W_Hyprland_Settings-x86_64.AppImage b/apps/ML4W_Hyprland_Settings-x86_64.AppImage
index e2a7ce4..f468676 100755
Binary files a/apps/ML4W_Hyprland_Settings-x86_64.AppImage and b/apps/ML4W_Hyprland_Settings-x86_64.AppImage differ
diff --git a/apps/ml4w-dotfiles-settings.desktop b/apps/ml4w-dotfiles-settings.desktop
index bc8d0d5..f031bea 100755
--- a/apps/ml4w-dotfiles-settings.desktop
+++ b/apps/ml4w-dotfiles-settings.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
-Name=ML4W Hyprland Settings App
-Exec=HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage
-Icon=HOME/dotfiles/apps/ml4w-icon.png
+Name=ML4W Dotfiles Settings App
+Exec=HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+Icon=HOME/dotfiles/apps/ml4w-dotfiles-settings.png
Terminal=false
Categories=Utility
\ No newline at end of file
diff --git a/apps/ml4w-dotfiles-settings.png b/apps/ml4w-dotfiles-settings.png
new file mode 100644
index 0000000..938b6f7
Binary files /dev/null and b/apps/ml4w-dotfiles-settings.png differ
diff --git a/apps/ml4w-hyprland-settings.desktop b/apps/ml4w-hyprland-settings.desktop
index 8aba4de..483c0d3 100755
--- a/apps/ml4w-hyprland-settings.desktop
+++ b/apps/ml4w-hyprland-settings.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
-Name=ML4W Dotfiles Settings App
-Exec=HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
-Icon=HOME/dotfiles/apps/ml4w-icon.png
+Name=ML4W Hyprland Settings App
+Exec=HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage
+Icon=HOME/dotfiles/apps/ml4w-hyprland-settings.png
Terminal=false
Categories=Utility
\ No newline at end of file
diff --git a/apps/ml4w-hyprland-settings.png b/apps/ml4w-hyprland-settings.png
new file mode 100644
index 0000000..c7e8e29
Binary files /dev/null and b/apps/ml4w-hyprland-settings.png differ
diff --git a/apps/ml4w-welcome.png b/apps/ml4w-welcome.png
new file mode 100644
index 0000000..7d4efe7
Binary files /dev/null and b/apps/ml4w-welcome.png differ
diff --git a/eww/images/icons/apps/discord.png b/eww/images/icons/apps/discord.png
deleted file mode 100644
index f7e6073..0000000
Binary files a/eww/images/icons/apps/discord.png and /dev/null differ
diff --git a/eww/images/icons/apps/files.png b/eww/images/icons/apps/files.png
deleted file mode 100644
index 728ca8b..0000000
Binary files a/eww/images/icons/apps/files.png and /dev/null differ
diff --git a/eww/images/icons/apps/firefox.png b/eww/images/icons/apps/firefox.png
deleted file mode 100644
index 483b03d..0000000
Binary files a/eww/images/icons/apps/firefox.png and /dev/null differ
diff --git a/eww/images/icons/apps/notes.png b/eww/images/icons/apps/notes.png
deleted file mode 100644
index f197628..0000000
Binary files a/eww/images/icons/apps/notes.png and /dev/null differ
diff --git a/eww/images/icons/apps/reddit.png b/eww/images/icons/apps/reddit.png
deleted file mode 100644
index 8943d8a..0000000
Binary files a/eww/images/icons/apps/reddit.png and /dev/null differ
diff --git a/eww/images/icons/apps/telegram.png b/eww/images/icons/apps/telegram.png
deleted file mode 100644
index 0deac60..0000000
Binary files a/eww/images/icons/apps/telegram.png and /dev/null differ
diff --git a/eww/images/icons/apps/terminal.png b/eww/images/icons/apps/terminal.png
deleted file mode 100644
index f16934a..0000000
Binary files a/eww/images/icons/apps/terminal.png and /dev/null differ
diff --git a/eww/images/icons/battery/battery-1.png b/eww/images/icons/battery/battery-1.png
deleted file mode 100644
index 4e07622..0000000
Binary files a/eww/images/icons/battery/battery-1.png and /dev/null differ
diff --git a/eww/images/icons/battery/battery-2.png b/eww/images/icons/battery/battery-2.png
deleted file mode 100644
index 9606aef..0000000
Binary files a/eww/images/icons/battery/battery-2.png and /dev/null differ
diff --git a/eww/images/icons/battery/battery-3.png b/eww/images/icons/battery/battery-3.png
deleted file mode 100644
index bd80964..0000000
Binary files a/eww/images/icons/battery/battery-3.png and /dev/null differ
diff --git a/eww/images/icons/battery/charge.png b/eww/images/icons/battery/charge.png
deleted file mode 100644
index 04667ff..0000000
Binary files a/eww/images/icons/battery/charge.png and /dev/null differ
diff --git a/eww/images/icons/battery/full.png b/eww/images/icons/battery/full.png
deleted file mode 100644
index 9e0b12d..0000000
Binary files a/eww/images/icons/battery/full.png and /dev/null differ
diff --git a/eww/images/icons/battery/low.png b/eww/images/icons/battery/low.png
deleted file mode 100644
index 4e07622..0000000
Binary files a/eww/images/icons/battery/low.png and /dev/null differ
diff --git a/eww/images/icons/dashboard.svg b/eww/images/icons/dashboard.svg
deleted file mode 100644
index f497a74..0000000
--- a/eww/images/icons/dashboard.svg
+++ /dev/null
@@ -1,2 +0,0 @@
-
-
diff --git a/eww/images/icons/gmail.png b/eww/images/icons/gmail.png
deleted file mode 100644
index 94f05a2..0000000
Binary files a/eww/images/icons/gmail.png and /dev/null differ
diff --git a/eww/images/icons/music/next-button.png b/eww/images/icons/music/next-button.png
deleted file mode 100644
index fa4ce72..0000000
Binary files a/eww/images/icons/music/next-button.png and /dev/null differ
diff --git a/eww/images/icons/music/pause-button.png b/eww/images/icons/music/pause-button.png
deleted file mode 100644
index 062d736..0000000
Binary files a/eww/images/icons/music/pause-button.png and /dev/null differ
diff --git a/eww/images/icons/music/play-button.png b/eww/images/icons/music/play-button.png
deleted file mode 100644
index abaa5f3..0000000
Binary files a/eww/images/icons/music/play-button.png and /dev/null differ
diff --git a/eww/images/icons/music/previous-button.png b/eww/images/icons/music/previous-button.png
deleted file mode 100644
index a727f66..0000000
Binary files a/eww/images/icons/music/previous-button.png and /dev/null differ
diff --git a/eww/images/icons/quotes.png b/eww/images/icons/quotes.png
deleted file mode 100644
index 11ef10f..0000000
Binary files a/eww/images/icons/quotes.png and /dev/null differ
diff --git a/eww/images/icons/search.svg b/eww/images/icons/search.svg
deleted file mode 100644
index ab5c50a..0000000
--- a/eww/images/icons/search.svg
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
diff --git a/eww/images/icons/system/no-wifi.png b/eww/images/icons/system/no-wifi.png
deleted file mode 100644
index 1e00942..0000000
Binary files a/eww/images/icons/system/no-wifi.png and /dev/null differ
diff --git a/eww/images/icons/system/poweroff.png b/eww/images/icons/system/poweroff.png
deleted file mode 100644
index 80e89d1..0000000
Binary files a/eww/images/icons/system/poweroff.png and /dev/null differ
diff --git a/eww/images/icons/system/shutdown.png b/eww/images/icons/system/shutdown.png
deleted file mode 100644
index 7f113b5..0000000
Binary files a/eww/images/icons/system/shutdown.png and /dev/null differ
diff --git a/eww/images/icons/system/sys-exit.png b/eww/images/icons/system/sys-exit.png
deleted file mode 100644
index cf1ab31..0000000
Binary files a/eww/images/icons/system/sys-exit.png and /dev/null differ
diff --git a/eww/images/icons/system/sys-lock.png b/eww/images/icons/system/sys-lock.png
deleted file mode 100644
index 72530d6..0000000
Binary files a/eww/images/icons/system/sys-lock.png and /dev/null differ
diff --git a/eww/images/icons/system/sys-reboot.png b/eww/images/icons/system/sys-reboot.png
deleted file mode 100644
index b433e24..0000000
Binary files a/eww/images/icons/system/sys-reboot.png and /dev/null differ
diff --git a/eww/images/icons/system/sys-sleep.png b/eww/images/icons/system/sys-sleep.png
deleted file mode 100644
index a425d19..0000000
Binary files a/eww/images/icons/system/sys-sleep.png and /dev/null differ
diff --git a/eww/images/icons/system/wifi.png b/eww/images/icons/system/wifi.png
deleted file mode 100644
index 142a2df..0000000
Binary files a/eww/images/icons/system/wifi.png and /dev/null differ
diff --git a/eww/images/icons/volume/mute.png b/eww/images/icons/volume/mute.png
deleted file mode 100644
index 33488c1..0000000
Binary files a/eww/images/icons/volume/mute.png and /dev/null differ
diff --git a/eww/images/icons/volume/volume.png b/eww/images/icons/volume/volume.png
deleted file mode 100644
index 0be34b8..0000000
Binary files a/eww/images/icons/volume/volume.png and /dev/null differ
diff --git a/eww/images/music.png b/eww/images/music.png
deleted file mode 100644
index 3ded333..0000000
Binary files a/eww/images/music.png and /dev/null differ
diff --git a/eww/images/profile.jpg b/eww/images/profile.jpg
deleted file mode 100644
index 575528e..0000000
Binary files a/eww/images/profile.jpg and /dev/null differ
diff --git a/eww/ml4w-dashboard/eww.scss b/eww/ml4w-dashboard/eww.scss
deleted file mode 100644
index 4bc663b..0000000
--- a/eww/ml4w-dashboard/eww.scss
+++ /dev/null
@@ -1,79 +0,0 @@
-/** Global *******************************************/
-*{
- all: unset;
- font-family: "Fira Sans";
- color: #151515;
-}
-
-
-/** Boxes ***********************************/
-.winbox {
- background-color: #F5EEE6;
- border: 1px solid #161616;
- border-radius: 12px;
-}
-
-/** Resources ***********************************/
-.res_box {
- background-color: #F0E9E1;
- border: 1px solid #E6DFD7;
- border-radius: 12px;
- padding: 14px 18px 14px 18px;
-}
-
-.res_circle {
- background-color: #E1DCD2;
- border: 0px solid #161616;
- border-radius: 100%;
- padding: 0px;
-}
-
-.res_circle_small {
- background-color: #F5EEE6;
- border: 0px solid #161616;
- border-radius: 100%;
- padding: 40px;
-}
-
-.res_text {
- background-color: #E6E1D7;
- border: 2px solid #161616;
- border-radius: 16px;
- font-size : 18px;
- padding: 0px 8px 0px 8px;
- margin: 0px 0px 0px 0px;
- font-weight : bold;
-}
-
-.res_cpu {
- color: #FD6B85;
-}
-
-.res_mem {
- color: #B1A6EE;
-}
-
-.res_disk {
- color: #67D4F1;
-}
-
-/** Power Buttons ***********************************/
-.powericons {
- background-repeat: no-repeat;
- background-size: 48px;
- min-height: 48px;
- min-width: 48px;
-}
-
-/** Quotes ***********************************/
-.quote_box {
- margin: 20px;
-}
-
-.quote_text {
- font-size : 14px;
- font-style: italic;
- font-weight : bold;
-}
-
-/** EOF *************************************************/
\ No newline at end of file
diff --git a/eww/ml4w-dashboard/eww.yuck b/eww/ml4w-dashboard/eww.yuck
deleted file mode 100644
index ed08e05..0000000
--- a/eww/ml4w-dashboard/eww.yuck
+++ /dev/null
@@ -1,140 +0,0 @@
-;; Variables
-
-;; System vars
-(defpoll HOST :interval "5s" `hostname`)
-(defpoll CPU_USAGE :interval "1s" `../scripts/sys_info --cpu`)
-(defpoll MEM_USAGE :interval "1s" `../scripts/sys_info --mem`)
-(defpoll DISK_USAGE :interval "1s" `../scripts/sys_info --disk`)
-(defpoll BLIGHT :interval "1s" `../scripts/sys_info --blight`)
-(defpoll BATTERY :interval "5s" `../scripts/sys_info --bat`)
-(defpoll QUOTE :interval "5m" `../scripts/quotes`)
-
-;; Widgets
-
-;; resources
-(defwidget resources []
- (box :class "winbox"
- (centerbox :orientation "h"
- (box :class "res_box" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
- (box :class "res_circle" :orientation "v" :valign "center" :halign "center"
- (circular-progress :class "res_cpu" :value CPU_USAGE :thickness 15
- (label :class "res_circle_small" :text "CPU")))
- (label :class "res_text" :valign "end" :halign "center" :text "${CPU_USAGE}%"))
- (box :class "res_box" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
- (box :class "res_circle" :orientation "v" :valign "center" :halign "center"
- (circular-progress :class "res_mem" :value MEM_USAGE :thickness 15
- (label :class "res_circle_small" :text "MEMORY")))
- (label :class "res_text" :valign "end" :halign "center" :text "${MEM_USAGE}%"))
- (box :class "res_box" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
- (box :class "res_circle" :orientation "v" :valign "center" :halign "center"
- (circular-progress :class "res_disk" :value DISK_USAGE :thickness 15
- (label :class "res_circle_small" :text "DISK")))
- (label :class "res_text" :valign "end" :halign "center" :text "${DISK_USAGE}%")))))
-
-;; powermenus
-(defwidget logout []
- (box :class "winbox"
- (button :style "background-image: url('../images/icons/system/sys-exit.png');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system --logout")))
-(defwidget suspend []
- (box :class "winbox"
- (button :style "background-image: url('../images/icons/system/sys-sleep.png');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system --suspend")))
-(defwidget lock []
- (box :class "winbox"
- (button :style "background-image: url('../images/icons/system/sys-lock.png');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system --suspend")))
-(defwidget reboot []
- (box :class "winbox"
- (button :style "background-image: url('../images/icons/system/sys-reboot.png');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system --reboot")))
-(defwidget shutdown []
- (box :class "winbox"
- (button :style "background-image: url('../images/icons/system/poweroff.png');" :class "powericons" :valign "center" :halign "center" :onclick "../scripts/system --shutdown")))
-
-;; quotes
-(defwidget quotes []
- (box :class "winbox"
- (box :class "quote_box" :orientation "h" :valign "center" :halign "center" :spacing 10 :space-evenly "false"
- (box :class "powericons" :style "background-image: url('../images/icons/quotes.png');")
- (box :class "powericons" :style "background-image: url('../images/icons/quotes.png');")
- (box :class "powericons" :style "background-image: url('../images/icons/quotes.png');")
- (label :class "quote_text" :valign "center" :halign "center" :text QUOTE :wrap true :limit-width 90 ))))
-
-;; ** Windows *************************************************************************
-
-;; resources
-(defwindow resources
- :monitor 0
- :geometry (geometry :x "15px"
- :y "15px"
- :width "480px"
- :height "200px"
- :anchor "top right")
- :stacking "fg"
- :wm-ignore false
-(resources))
-
-;; powermenu
-(defwindow logout
- :monitor 0
- :geometry (geometry :x "1420px"
- :y "320px"
- :width "80px"
- :height "80px"
- :anchor "top left")
- :stacking "fg"
- :wm-ignore false
-(logout))
-
-(defwindow suspend
- :monitor 0
- :geometry (geometry :x "1520px"
- :y "320px"
- :width "80px"
- :height "80px"
- :anchor "top left")
- :stacking "fg"
- :wm-ignore false
-(suspend))
-
-(defwindow lock
- :monitor 0
- :geometry (geometry :x "1620px"
- :y "320px"
- :width "80px"
- :height "80px"
- :anchor "top left")
- :stacking "fg"
- :wm-ignore false
-(lock))
-
-(defwindow reboot
- :monitor 0
- :geometry (geometry :x "1720px"
- :y "320px"
- :width "80px"
- :height "80px"
- :anchor "top left")
- :stacking "fg"
- :wm-ignore false
-(reboot))
-
-(defwindow shutdown
- :monitor 0
- :geometry (geometry :x "1820px"
- :y "320px"
- :width "80px"
- :height "80px"
- :anchor "top left")
- :stacking "fg"
- :wm-ignore false
-(shutdown))
-
-;; quotes
-(defwindow quotes
- :monitor 0
- :geometry (geometry :x "1420px"
- :y "420px"
- :width "480px"
- :height "100px"
- :anchor "top left")
- :stacking "fg"
- :wm-ignore false
-(quotes))
\ No newline at end of file
diff --git a/eww/ml4w-dashboard/launch.sh b/eww/ml4w-dashboard/launch.sh
deleted file mode 100755
index 9dc5f98..0000000
--- a/eww/ml4w-dashboard/launch.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-## Files and CMD
-FILE="$HOME/.cache/eww_launch.sidebar"
-CFG="$HOME/dotfiles/eww/ml4w-dashboard"
-EWW=`which eww`
-
-## Run eww daemon if not running already
-if [[ ! `pidof eww` ]]; then
- ${EWW} daemon
- sleep 1
-fi
-
-## Open widgets
-run_eww() {
- ${EWW} --config "$CFG" open-many \
- resources \
- logout \
- suspend \
- lock \
- reboot \
- shutdown \
- quotes
-}
-
-## Launch or close widgets accordingly
-if [[ ! -f "$FILE" ]]; then
- touch "$FILE"
- run_eww
-else
- ${EWW} --config "$CFG" close resources logout suspend lock reboot shutdown quotes
- rm "$FILE"
-fi
\ No newline at end of file
diff --git a/eww/ml4w-sidebar/eww.scss b/eww/ml4w-sidebar/eww.scss
new file mode 100644
index 0000000..657b7dc
--- /dev/null
+++ b/eww/ml4w-sidebar/eww.scss
@@ -0,0 +1,87 @@
+*{
+ all: unset;
+ font-family: "Fira Sans";
+ color: #FFFFFF;
+}
+
+.winbox {
+ background-color: #242424;
+ opacity: 0.85;
+ border: 1px solid #FFFFFF;
+ border-radius: 12px;
+}
+
+.res_box {
+ background-color: #242424;
+ border-radius: 12px;
+ padding: 14px 18px 14px 18px;
+}
+
+.res_circle {
+ background-color: #FFFFFF;
+ border: 0px solid #161616;
+ color:#FFFFFF;
+ border-radius: 100%;
+ padding: 0px;
+}
+
+.ml4w_icon {
+ background-repeat: no-repeat;
+ background-size: 48px;
+ min-height: 48px;
+ min-width: 48px;
+}
+
+.res_circle_small {
+ background-color: #242424;
+ border: 0px solid #161616;
+ border-radius: 100%;
+ padding: 40px;
+ color:#FFFFFF;
+}
+
+.res_text {
+ border-radius: 16px;
+ color: #FFFFFF;
+ font-size : 16px;
+ padding: 0px 8px 0px 8px;
+ margin: 0px 0px 0px 0px;
+ font-weight : bold;
+}
+
+.res_cpu {
+ color: #19cddb;
+}
+
+.res_mem {
+ color: #a5deb7;
+}
+
+.res_disk {
+ color: #cfb3ff;
+}
+
+.powericons_logout {
+ font-size: 32px;
+ padding-left: 4px;
+}
+
+.powericons_shutdown {
+ font-size: 32px;
+ padding-right: 9px;
+}
+
+.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
new file mode 100644
index 0000000..8fa069a
--- /dev/null
+++ b/eww/ml4w-sidebar/eww.yuck
@@ -0,0 +1,168 @@
+;; Variables
+
+;; System vars
+(defpoll HOST :interval "5s" `hostname`)
+(defpoll CPU_USAGE :interval "1s" `../scripts/sys_info.sh --cpu`)
+(defpoll MEM_USAGE :interval "1s" `../scripts/sys_info.sh --mem`)
+(defpoll DISK_USAGE :interval "1s" `../scripts/sys_info.sh --disk`)
+
+;; Widgets
+
+;; resources
+(defwidget ml4wlauncher []
+ (box :class "winbox"
+ (centerbox :orientation "h"
+ (box :class "ml4w-welcome" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
+ (button :style "background-image: url('../../apps/ml4w-welcome.png');" :class "ml4w_icon" :orientation "v" :valign "center" :halign "center" :onclick "../scripts/launch_app.sh --welcome")
+ (label :class "res_text" :valign "end" :halign "center" :text "Welcome App")
+ )
+ (box :class "ml4w-dotfiles" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
+ (button :style "background-image: url('../../apps/ml4w-dotfiles-settings.png');" :class "ml4w_icon" :orientation "v" :valign "center" :halign "center" :onclick "../scripts/launch_app.sh --dotfiles")
+ (label :class "res_text" :valign "end" :halign "center" :text "Dotfiles App")
+ )
+ (box :class "ml4w-hyprland" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
+ (button :style "background-image: url('../../apps/ml4w-hyprland-settings.png');" :class "ml4w_icon" :orientation "v" :valign "center" :halign "center" :onclick "../scripts/launch_app.sh --hyprland")
+ (label :class "res_text" :valign "end" :halign "center" :text "Hyprland App")
+ )
+ )
+ )
+)
+
+(defwidget resources []
+ (box :class "winbox"
+ (centerbox :orientation "h"
+ (box :class "res_box" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
+ (box :class "res_circle" :orientation "v" :valign "center" :halign "center"
+ (circular-progress :class "res_cpu" :value CPU_USAGE :thickness 15
+ (label :class "res_circle_small" :text "CPU")
+ )
+ )
+ (label :class "res_text" :valign "end" :halign "center" :text "${CPU_USAGE}%")
+ )
+ (box :class "res_box" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
+ (box :class "res_circle" :orientation "v" :valign "center" :halign "center"
+ (circular-progress :class "res_mem" :value MEM_USAGE :thickness 15
+ (label :class "res_circle_small" :text "MEMORY")
+ )
+ )
+ (label :class "res_text" :valign "end" :halign "center" :text "${MEM_USAGE}%")
+ )
+ (box :class "res_box" :orientation "v" :valign "center" :halign "center" :spacing 15 :space-evenly "false"
+ (box :class "res_circle" :orientation "v" :valign "center" :halign "center"
+ (circular-progress :class "res_disk" :value DISK_USAGE :thickness 15
+ (label :class "res_circle_small" :text "DISK")
+ )
+ )
+ (label :class "res_text" :valign "end" :halign "center" :text "${DISK_USAGE}%")
+ )
+ )
+ )
+)
+
+;; powermenus
+(defwidget logout []
+ (box :class "winbox"
+ (button :class "powericons_logout" :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 &" "")
+ )
+)
+(defwidget lock []
+ (box :class "winbox"
+ (button :class "powericons_lock" :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 &" "")
+ )
+)
+(defwidget shutdown []
+ (box :class "winbox"
+ (button :class "powericons_shutdown" :valign "center" :halign "center" :onclick "../scripts/system.sh shutdown &" "")
+ )
+)
+
+;; ** Windows *************************************************************************
+
+(defwindow ml4wlauncher
+ :monitor 0
+ :geometry (geometry :x "15px"
+ :y "15px"
+ :width "480px"
+ :height "140px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(ml4wlauncher))
+
+;; resources
+(defwindow resources
+ :monitor 0
+ :geometry (geometry :x "15px"
+ :y "170px"
+ :width "480px"
+ :height "180px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(resources))
+
+;; powermenu
+(defwindow logout
+ :monitor 0
+ :geometry (geometry :x "15px"
+ :y "365px"
+ :width "80px"
+ :height "80px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(logout))
+
+(defwindow suspend
+ :monitor 0
+ :geometry (geometry :x "114px"
+ :y "365px"
+ :width "80px"
+ :height "80px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(suspend))
+
+(defwindow lock
+ :monitor 0
+ :geometry (geometry :x "214px"
+ :y "365px"
+ :width "80px"
+ :height "80px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(lock))
+
+(defwindow reboot
+ :monitor 0
+ :geometry (geometry :x "315px"
+ :y "365px"
+ :width "80px"
+ :height "80px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(reboot))
+
+(defwindow shutdown
+ :monitor 0
+ :geometry (geometry :x "415px"
+ :y "365px"
+ :width "80px"
+ :height "80px"
+ :anchor "top right")
+ :stacking "fg"
+ :wm-ignore false
+(shutdown))
diff --git a/eww/ml4w-sidebar/launch.sh b/eww/ml4w-sidebar/launch.sh
new file mode 100755
index 0000000..ed0d930
--- /dev/null
+++ b/eww/ml4w-sidebar/launch.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+FILE="$HOME/.cache/ml4w_sidebar"
+CFG="$HOME/dotfiles/eww/ml4w-sidebar"
+EWW=`which eww`
+
+if [[ ! `pidof eww` ]]; then
+ ${EWW} daemon
+ sleep 0.5
+fi
+
+if [[ ! -f "$FILE" ]]; then
+ touch "$FILE"
+ ${EWW} --config "$CFG" open-many ml4wlauncher resources logout suspend lock reboot shutdown
+else
+ ${EWW} --config "$CFG" close resources ml4wlauncher logout suspend lock reboot shutdown
+ rm "$FILE"
+fi
\ No newline at end of file
diff --git a/eww/scripts/battery b/eww/scripts/battery
deleted file mode 100755
index 97b7f95..0000000
--- a/eww/scripts/battery
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-## Get battery info
-BATTERY="$(acpi | awk -F ' ' 'END {print $4}' | tr -d \%,)"
-CHARGE="$(acpi | awk -F ' ' 'END {print $3}' | tr -d \,)"
-
-main() {
- if [[ ($CHARGE = *"Charging"*) && ($BATTERY -lt "100") ]]; then
- echo "images/icons/battery/charge.png"
- elif [[ $CHARGE = *"Full"* ]]; then
- echo "images/icons/battery/full.png"
- else
- if [[ ($BATTERY -lt 100) && (($BATTERY -gt 65) || ($BATTERY -eq 65)) ]]; then
- echo "images/icons/battery/battery-3.png"
- elif [[ ($BATTERY -lt 65) && (($BATTERY -gt 35) || ($BATTERY -eq 35)) ]]; then
- echo "images/icons/battery/battery-2.png"
- elif [[ ($BATTERY -lt 35) && (($BATTERY -gt 10) || ($BATTERY -eq 10)) ]]; then
- echo "images/icons/battery/battery-1.png"
- elif [[ ($BATTERY -lt 10) && (($BATTERY -gt 0) || ($BATTERY -eq 0)) ]]; then
- echo "images/icons/battery/low.png"
- fi
- fi
-}
-
-if [[ $1 == '--icon' ]]; then
- main
-elif [[ $1 == '--perc' ]]; then
- echo "${BATTERY}%"
-fi
diff --git a/eww/scripts/check-network b/eww/scripts/check-network
deleted file mode 100755
index 9efc80f..0000000
--- a/eww/scripts/check-network
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-count=0
-
-ID="$(ip link | awk '/state UP/ {print $2}')"
-SSID="$(iwgetid -r)"
-
-net_stat () {
- if (ping -c 1 archlinux.org || ping -c 1 google.com || ping -c 1 bitbucket.org || ping -c 1 github.com || ping -c 1 sourceforge.net) &>/dev/null; then
- if [[ $ID == e* ]]; then
- echo "Online"
- echo "images/icons/system/wifi.png"
- else
- echo "$SSID"
- echo "images/icons/system/wifi.png"
- fi
- else
- echo "Offline"
- echo "images/icons/system/no-wifi.png"
- fi
-}
-
-if [[ $1 == '--stat' ]]; then
- net_stat | head -n1
-elif [[ $1 == '--icon' ]]; then
- net_stat | tail -n1
-fi
diff --git a/eww/scripts/launch_app.sh b/eww/scripts/launch_app.sh
new file mode 100755
index 0000000..bea17da
--- /dev/null
+++ b/eww/scripts/launch_app.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+$HOME/dotfiles/eww/ml4w-sidebar/launch.sh
+
+if [[ "$1" == "--welcome" ]]; then
+ $HOME/dotfiles/apps/ML4W_Welcome-x86_64.AppImage
+elif [[ "$1" == "--dotfiles" ]]; then
+ $HOME/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage
+elif [[ "$1" == "--hyprland" ]]; then
+ $HOME/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage
+else
+ echo "ERROR: $1 not found"
+fi
+
diff --git a/eww/scripts/mails b/eww/scripts/mails
deleted file mode 100755
index 974d00a..0000000
--- a/eww/scripts/mails
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/python
-
-import imaplib
-obj = imaplib.IMAP4_SSL('imap.gmail.com',993)
-obj.login('username@gmail.com','PASSWORD') # write your email and password
-obj.select()
-print(len(obj.search(None, 'UnSeen')[1][0].split()))
diff --git a/eww/scripts/music_info b/eww/scripts/music_info
deleted file mode 100755
index 6831cc6..0000000
--- a/eww/scripts/music_info
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/bin/bash
-
-## Get data
-STATUS="$(mpc status)"
-COVER="/tmp/.music_cover.jpg"
-MUSIC_DIR="$HOME/Music"
-
-## Get status
-get_status() {
- if [[ $STATUS == *"[playing]"* ]]; then
- echo "images/icons/music/pause-button.png"
- else
- echo "images/icons/music/play-button.png"
- fi
-}
-
-## Get song
-get_song() {
- song=`mpc -f %title% current`
- if [[ -z "$song" ]]; then
- echo "Offline"
- else
- echo "$song"
- fi
-}
-
-## Get artist
-get_artist() {
- artist=`mpc -f %artist% current`
- if [[ -z "$artist" ]]; then
- echo "Offline"
- else
- echo "$artist"
- fi
-}
-
-## Get time
-get_time() {
- time=`mpc status | grep "%)" | awk '{print $4}' | tr -d '(%)'`
- if [[ -z "$time" ]]; then
- echo "0"
- else
- echo "$time"
- fi
-}
-get_ctime() {
- ctime=`mpc status | grep "#" | awk '{print $3}' | sed 's|/.*||g'`
- if [[ -z "$ctime" ]]; then
- echo "0:00"
- else
- echo "$ctime"
- fi
-}
-get_ttime() {
- ttime=`mpc -f %time% current`
- if [[ -z "$ttime" ]]; then
- echo "0:00"
- else
- echo "$ttime"
- fi
-}
-
-## Get cover
-get_cover() {
- ffmpeg -i "${MUSIC_DIR}/$(mpc current -f %file%)" "${COVER}" -y &> /dev/null
- STATUS=$?
-
- # Check if the file has a embbeded album art
- if [ "$STATUS" -eq 0 ];then
- echo "$COVER"
- else
- echo "images/music.png"
- fi
-}
-
-## Execute accordingly
-if [[ "$1" == "--song" ]]; then
- get_song
-elif [[ "$1" == "--artist" ]]; then
- get_artist
-elif [[ "$1" == "--status" ]]; then
- get_status
-elif [[ "$1" == "--time" ]]; then
- get_time
-elif [[ "$1" == "--ctime" ]]; then
- get_ctime
-elif [[ "$1" == "--ttime" ]]; then
- get_ttime
-elif [[ "$1" == "--cover" ]]; then
- get_cover
-elif [[ "$1" == "--toggle" ]]; then
- mpc -q toggle
-elif [[ "$1" == "--next" ]]; then
- { mpc -q next; get_cover; }
-elif [[ "$1" == "--prev" ]]; then
- { mpc -q prev; get_cover; }
-fi
diff --git a/eww/scripts/quotes b/eww/scripts/quotes
deleted file mode 100755
index 8706cb3..0000000
--- a/eww/scripts/quotes
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-quote="`fortune -n 90 -s | head -n 1`"
-echo "$quote"
diff --git a/eww/scripts/sys_info b/eww/scripts/sys_info.sh
similarity index 100%
rename from eww/scripts/sys_info
rename to eww/scripts/sys_info.sh
diff --git a/eww/scripts/system b/eww/scripts/system
deleted file mode 100755
index 4d805df..0000000
--- a/eww/scripts/system
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-CFG="$HOME/.config/eww/arin/sidedar"
-EWW=`which eww`
-
-close_eww() {
- ${EWW} --config "$CFG" close resources logout suspend lock reboot shutdown quotes
-}
-
-## Options #############################################
-if [[ $1 = "--lock" ]]; then
- close_eww
- betterlockscreen --lock
-
-elif [[ $1 = "--logout" ]]; then
- close_eww
- #openbox --exit
- berryc quit
-
-elif [[ $1 = "--suspend" ]]; then
- close_eww
- amixer set Master mute
- systemctl suspend
-
-elif [[ $1 = "--reboot" ]]; then
- close_eww
- systemctl reboot
-
-elif [[ $1 = "--shutdown" ]]; then
- close_eww
- systemctl poweroff
-
-## Help Menu #############################################
-else
-echo "
-Available options:
---lock --logout --suspend --reboot --shutdown
-"
-fi
diff --git a/eww/scripts/system.sh b/eww/scripts/system.sh
new file mode 100755
index 0000000..d10441d
--- /dev/null
+++ b/eww/scripts/system.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+sleep 0.3
+$HOME/dotfiles/eww/ml4w-sidebar/launch.sh
+
+if [[ "$1" == "reboot" ]]; then
+ $HOME/dotfiles/hypr/scripts/reboot.sh
+elif [[ "$1" == "shutdown" ]]; then
+ $HOME/dotfiles/hypr/scripts/shutdown.sh
+elif [[ "$1" == "lock" ]]; then
+ $HOME/dotfiles/hypr/scripts/lock.sh
+elif [[ "$1" == "suspend" ]]; then
+ $HOME/dotfiles/hypr/scripts/suspend.sh
+elif [[ "$1" == "logout" ]]; then
+ $HOME/dotfiles/hypr/scripts/exit.sh
+fi
diff --git a/eww/scripts/volume b/eww/scripts/volume
deleted file mode 100755
index 4e679a2..0000000
--- a/eww/scripts/volume
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-
-# Get Volume
-get_volume() {
- status=`amixer get Master | tail -n1 | grep -wo 'on'`
-
- if [[ "$status" == "on" ]]; then
- volume=`amixer get Master | tail -n1 | awk -F ' ' '{print $5}' | tr -d '[]'`
- echo "$volume"
- else
- echo "Mute"
- fi
-}
-
-# Get icons
-get_icon() {
- vol="$(get_volume)"
- current="${vol%%%}"
- status=`amixer get Master | tail -n1 | grep -wo 'on'`
-
- if [[ "$status" == "on" ]]; then
- if [[ "$current" -eq "0" ]]; then
- echo "images/icons/volume/mute.png"
- elif [[ ("$current" -ge "0") && ("$current" -le "30") ]]; then
- echo "images/icons/volume/volume.png"
- elif [[ ("$current" -ge "30") && ("$current" -le "60") ]]; then
- echo "images/icons/volume/volume.png"
- elif [[ ("$current" -ge "60") && ("$current" -le "100") ]]; then
- echo "images/icons/volume/volume.png"
- fi
- else
- echo "images/icons/volume/mute.png"
- fi
-}
-
-# Increase Volume
-inc_volume() {
- amixer -Mq set Master,0 5%+ unmute
-}
-
-# Decrease Volume
-dec_volume() {
- amixer -Mq set Master,0 5%- unmute
-}
-
-# Toggle Mute
-toggle_mute() {
- status=`amixer get Master | tail -n1 | grep -wo 'on'`
-
- if [[ "$status" == "on" ]]; then
- amixer set Master toggle
- else
- amixer set Master toggle
- fi
-}
-
-# Execute accordingly
-if [[ "$1" == "--get" ]]; then
- get_volume
-elif [[ "$1" == "--icon" ]]; then
- get_icon
-elif [[ "$1" == "--inc" ]]; then
- inc_volume
-elif [[ "$1" == "--dec" ]]; then
- dec_volume
-elif [[ "$1" == "--toggle" ]]; then
- toggle_mute
-else
- get_volume
-fi
diff --git a/eww/scripts/weather_info b/eww/scripts/weather_info
deleted file mode 100755
index 6fee821..0000000
--- a/eww/scripts/weather_info
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/bash
-
-## Collect data
-cache_dir="$HOME/.cache/eww/weather"
-cache_weather_stat=${cache_dir}/weather-stat
-cache_weather_degree=${cache_dir}/weather-degree
-cache_weather_quote=${cache_dir}/weather-quote
-cache_weather_hex=${cache_dir}/weather-hex
-cache_weather_icon=${cache_dir}/weather-icon
-
-## Weather data
-KEY="YOUR_KEY"
-ID="CITY_ID"
-UNIT="metric" # Available options : 'metric' or 'imperial'
-
-## Make cache dir
-if [[ ! -d "$cache_dir" ]]; then
- mkdir -p ${cache_dir}
-fi
-
-## Get data
-get_weather_data() {
- weather=`curl -sf "http://api.openweathermap.org/data/2.5/weather?APPID="$KEY"&id="$ID"&units="$UNIT""`
- echo ${weather}
-
- if [ ! -z "$weather" ]; then
- weather_temp=`echo "$weather" | jq ".main.temp" | cut -d "." -f 1`
- weather_icon_code=`echo "$weather" | jq -r ".weather[].icon" | head -1`
- weather_description=`echo "$weather" | jq -r ".weather[].description" | head -1 | sed -e "s/\b\(.\)/\u\1/g"`
-
- #Big long if statement of doom
- if [ "$weather_icon_code" == "50d" ]; then
- weather_icon=" "
- weather_quote="Forecast says it's misty \nMake sure you don't get lost on your way..."
- weather_hex="#84afdb"
- elif [ "$weather_icon_code" == "50n" ]; then
- weather_icon=" "
- weather_quote="Forecast says it's a misty night \nDon't go anywhere tonight or you might get lost..."
- weather_hex="#84afdb"
- elif [ "$weather_icon_code" == "01d" ]; then
- weather_icon=" "
- weather_quote="It's a sunny day, gonna be fun! \nDon't go wandering all by yourself though..."
- weather_hex="#ffd86b"
- elif [ "$weather_icon_code" == "01n" ]; then
- weather_icon=" "
- weather_quote="It's a clear night \nYou might want to take a evening stroll to relax..."
- weather_hex="#fcdcf6"
- elif [ "$weather_icon_code" == "02d" ]; then
- weather_icon=" "
- weather_quote="It's cloudy, sort of gloomy \nYou'd better get a book to read..."
- weather_hex="#adadff"
- elif [ "$weather_icon_code" == "02n" ]; then
- weather_icon=" "
- weather_quote="It's a cloudy night \nHow about some hot chocolate and a warm bed?"
- weather_hex="#adadff"
- elif [ "$weather_icon_code" == "03d" ]; then
- weather_icon=" "
- weather_quote="It's cloudy, sort of gloomy \nYou'd better get a book to read..."
- weather_hex="#adadff"
- elif [ "$weather_icon_code" == "03n" ]; then
- weather_icon=" "
- weather_quote="It's a cloudy night \nHow about some hot chocolate and a warm bed?"
- weather_hex="#adadff"
- elif [ "$weather_icon_code" == "04d" ]; then
- weather_icon=" "
- weather_quote="It's cloudy, sort of gloomy \nYou'd better get a book to read..."
- weather_hex="#adadff"
- elif [ "$weather_icon_code" == "04n" ]; then
- weather_icon=" "
- weather_quote="It's a cloudy night \nHow about some hot chocolate and a warm bed?"
- weather_hex="#adadff"
- elif [ "$weather_icon_code" == "09d" ]; then
- weather_icon=" "
- weather_quote="It's rainy, it's a great day! \nGet some ramen and watch as the rain falls..."
- weather_hex="#6b95ff"
- elif [ "$weather_icon_code" == "09n" ]; then
- weather_icon=" "
- weather_quote=" It's gonna rain tonight it seems \nMake sure your clothes aren't still outside..."
- weather_hex="#6b95ff"
- elif [ "$weather_icon_code" == "10d" ]; then
- weather_icon=" "
- weather_quote="It's rainy, it's a great day! \nGet some ramen and watch as the rain falls..."
- weather_hex="#6b95ff"
- elif [ "$weather_icon_code" == "10n" ]; then
- weather_icon=" "
- weather_quote=" It's gonna rain tonight it seems \nMake sure your clothes aren't still outside..."
- weather_hex="#6b95ff"
- elif [ "$weather_icon_code" == "11d" ]; then
- weather_icon=""
- weather_quote="There's storm for forecast today \nMake sure you don't get blown away..."
- weather_hex="#ffeb57"
- elif [ "$weather_icon_code" == "11n" ]; then
- weather_icon=""
- weather_quote="There's gonna be storms tonight \nMake sure you're warm in bed and the windows are shut..."
- weather_hex="#ffeb57"
- elif [ "$weather_icon_code" == "13d" ]; then
- weather_icon=" "
- weather_quote="It's gonna snow today \nYou'd better wear thick clothes and make a snowman as well!"
- weather_hex="#e3e6fc"
- elif [ "$weather_icon_code" == "13n" ]; then
- weather_icon=" "
- weather_quote="It's gonna snow tonight \nMake sure you get up early tomorrow to see the sights..."
- weather_hex="#e3e6fc"
- elif [ "$weather_icon_code" == "40d" ]; then
- weather_icon=" "
- weather_quote="Forecast says it's misty \nMake sure you don't get lost on your way..."
- weather_hex="#84afdb"
- elif [ "$weather_icon_code" == "40n" ]; then
- weather_icon=" "
- weather_quote="Forecast says it's a misty night \nDon't go anywhere tonight or you might get lost..."
- weather_hex="#84afdb"
- else
- weather_icon=" "
- weather_quote="Sort of odd, I don't know what to forecast \nMake sure you have a good time!"
- weather_hex="#adadff"
- fi
- echo "$weather_icon" > ${cache_weather_icon}
- echo "$weather_description" > ${cache_weather_stat}
- echo "$weather_temp""°C" > ${cache_weather_degree}
- echo -e "$weather_quote" > ${cache_weather_quote}
- echo "$weather_hex" > ${cache_weather_hex}
- else
- echo "Weather Unavailable" > ${cache_weather_stat}
- echo " " > ${cache_weather_icon}
- echo -e "Ah well, no weather huh? \nEven if there's no weather, it's gonna be a great day!" > ${cache_weather_quote}
- echo "-" > ${cache_weather_degree}
- echo "#adadff" > ${tcache_weather_hex}
- fi
-}
-
-## Execute
-if [[ "$1" == "--getdata" ]]; then
- get_weather_data
-elif [[ "$1" == "--icon" ]]; then
- cat ${cache_weather_icon}
-elif [[ "$1" == "--temp" ]]; then
- cat ${cache_weather_degree}
-elif [[ "$1" == "--hex" ]]; then
- cat ${cache_weather_hex}
-elif [[ "$1" == "--stat" ]]; then
- cat ${cache_weather_stat}
-elif [[ "$1" == "--quote" ]]; then
- cat ${cache_weather_quote} | head -n1
-elif [[ "$1" == "--quote2" ]]; then
- cat ${cache_weather_quote} | tail -n1
-fi
-
diff --git a/eww/scripts/widget_apps b/eww/scripts/widget_apps
deleted file mode 100755
index 5d24e8f..0000000
--- a/eww/scripts/widget_apps
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" == "--tr" ]]; then
- alacritty --working-directory ~ &
-
-elif [[ "$1" == "--ff" ]]; then
- firefox &
-
-elif [[ "$1" == "--fm" ]]; then
- thunar ~ &
-
-elif [[ "$1" == "--ge" ]]; then
- geany &
-
-elif [[ "$1" == "--dc" ]]; then
- discord &
-
-elif [[ "$1" == "--tg" ]]; then
- telegram-desktop &
-
-elif [[ "$1" == "--rd" ]]; then
- firefox --new-tab "https://reddit.com"
-
-elif [[ "$1" == "--ml" ]]; then
- firefox --new-tab "https://mail.google.com"
-
-elif [[ "$1" == "--pow" ]]; then
- xfce4-power-manager-settings &
-
-elif [[ "$1" == "--nm" ]]; then
- networkmanager_dmenu
-
-fi
diff --git a/eww/scripts/widget_search b/eww/scripts/widget_search
deleted file mode 100755
index 176fcfd..0000000
--- a/eww/scripts/widget_search
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-if [[ "$1" == "--menu" ]]; then
- rofi -show drun
-
-elif [[ "$1" == "--search" ]]; then
- firefox --new-tab "https://google.com"
-
-fi
diff --git a/hypr/conf/ml4w.conf b/hypr/conf/ml4w.conf
index 534aa6c..ff04ece 100644
--- a/hypr/conf/ml4w.conf
+++ b/hypr/conf/ml4w.conf
@@ -33,4 +33,5 @@ windowrulev2 = center,class:(dotfiles-floating)
env = APPIMAGELAUNCHER_DISABLE,1
exec-once = ~/dotfiles/hypr/scripts/ml4w-welcome-autostart.sh
-exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh
\ No newline at end of file
+exec-once = ~/.config/ml4w-hyprland-settings/hyprctl.sh
+exec-once = ~/dotfiles/hypr/scripts/eww.sh
diff --git a/hypr/scripts/eww.sh b/hypr/scripts/eww.sh
new file mode 100755
index 0000000..4524508
--- /dev/null
+++ b/hypr/scripts/eww.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+EWW=`which eww`
+killall eww
+${EWW} daemon
\ No newline at end of file
diff --git a/hypr/scripts/exit.sh b/hypr/scripts/exit.sh
index 0b61635..c3e8a7a 100755
--- a/hypr/scripts/exit.sh
+++ b/hypr/scripts/exit.sh
@@ -1,3 +1,3 @@
#!/bin/bash
-sleep 1
+sleep 0.5
killall -9 Hyprland sleep 2
\ No newline at end of file
diff --git a/hypr/scripts/lock.sh b/hypr/scripts/lock.sh
new file mode 100755
index 0000000..bc13b07
--- /dev/null
+++ b/hypr/scripts/lock.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sleep 0.5
+hyprlock
\ No newline at end of file
diff --git a/hypr/scripts/reboot.sh b/hypr/scripts/reboot.sh
new file mode 100755
index 0000000..2ddff75
--- /dev/null
+++ b/hypr/scripts/reboot.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sleep 0.5
+systemctl reboot
diff --git a/hypr/scripts/shutdown.sh b/hypr/scripts/shutdown.sh
new file mode 100755
index 0000000..440d34b
--- /dev/null
+++ b/hypr/scripts/shutdown.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sleep 0.5
+systemctl suspend
\ No newline at end of file
diff --git a/hypr/scripts/suspend.sh b/hypr/scripts/suspend.sh
new file mode 100755
index 0000000..440d34b
--- /dev/null
+++ b/hypr/scripts/suspend.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sleep 0.5
+systemctl suspend
\ No newline at end of file
diff --git a/waybar/modules.json b/waybar/modules.json
index f251750..abc5134 100644
--- a/waybar/modules.json
+++ b/waybar/modules.json
@@ -58,8 +58,8 @@
// ML4W Welcome App
"custom/ml4w-welcome": {
- "on-click": "~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
- "on-click-right": "~/dotfiles/hypr/scripts/ml4w-launcher.sh",
+ "on-click": "sleep 0.1 && ~/dotfiles/eww/ml4w-sidebar/launch.sh",
+ "on-click-right": "sleep 0.1 && ~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage",
"format": " ",
"tooltip": false
},
@@ -143,20 +143,6 @@
"tooltip": false
},
- // Outlook Launcher
- "custom/outlook": {
- "format": "",
- "on-click": "chromium --app=https://outlook.office.com/mail/",
- "tooltip": false
- },
-
- // Teams Launcher
- "custom/teams": {
- "format": "",
- "on-click": "chromium --app=https://teams.microsoft.com/go",
- "tooltip": false
- },
-
// Browser Launcher
"custom/browser": {
"format": "",
@@ -291,7 +277,7 @@
// START CHATGPT TOOGLE
"custom/chatgpt",
// END CHATGPT TOOGLE
- "custom/wallpaper"
+ "custom/empty"
]
},
@@ -306,6 +292,7 @@
"modules": [
"custom/settings",
"custom/waybarthemes",
+ "custom/wallpaper",
"custom/ml4w-hyprland-settings"
]
},
diff --git a/waybar/themes/ml4w-blur/style.css b/waybar/themes/ml4w-blur/style.css
index 4cb8e66..433e59a 100644
--- a/waybar/themes/ml4w-blur/style.css
+++ b/waybar/themes/ml4w-blur/style.css
@@ -200,7 +200,7 @@ window#waybar.empty #window {
}
#custom-chatgpt {
- margin-right: 15px;
+ margin-right: 12px;
background-image: url("../assets/ai-icon-20.png");
background-repeat: no-repeat;
background-position: center;
diff --git a/waybar/themes/ml4w-minimal/style.css b/waybar/themes/ml4w-minimal/style.css
index 40be349..be802f2 100644
--- a/waybar/themes/ml4w-minimal/style.css
+++ b/waybar/themes/ml4w-minimal/style.css
@@ -142,12 +142,19 @@ window#waybar.empty #window {
}
#custom-settings {
- margin-right: 15;
+ margin-right: 15px;
+}
+#custom-browser {
+ margin-right: 16px;
+}
+
+#custom-wallpaper {
+ margin-right: 14px;
}
#custom-chatgpt {
- margin-right: 15px;
+ margin-right: 10px;
background-image: url("../assets/ai-icon-20.png");
background-repeat: no-repeat;
background-position: center;
diff --git a/waybar/themes/ml4w/style.css b/waybar/themes/ml4w/style.css
index 6b9bf48..035cad2 100644
--- a/waybar/themes/ml4w/style.css
+++ b/waybar/themes/ml4w/style.css
@@ -185,7 +185,7 @@ window#waybar.empty #window {
}
#custom-chatgpt {
- margin-right: 15px;
+ margin-right: 12px;
background-image: url("../assets/ai-icon.png");
background-repeat: no-repeat;
background-position: center;
diff --git a/wlogout/layout b/wlogout/layout
index 6a3a3c3..fc3c774 100644
--- a/wlogout/layout
+++ b/wlogout/layout
@@ -1,6 +1,6 @@
{
"label" : "lock",
- "action" : "sleep 1; hyprlock",
+ "action" : "$HOME/dotfiles/hypr/scripts/lock.sh",
"text" : "Lock",
"keybind" : "l"
}
@@ -18,19 +18,19 @@
}
{
"label" : "shutdown",
- "action" : "sleep 1; systemctl poweroff",
+ "action" : "$HOME/dotfiles/hypr/scripts/shutdown.sh",
"text" : "Shutdown",
"keybind" : "s"
}
{
"label" : "suspend",
- "action" : "sleep 1; systemctl suspend",
+ "action" : "$HOME/dotfiles/hypr/scripts/suspend.sh",
"text" : "Suspend",
"keybind" : "u"
}
{
"label" : "reboot",
- "action" : "sleep 1; systemctl reboot",
+ "action" : "$HOME/dotfiles/hypr/scripts/reboot.sh",
"text" : "Reboot",
"keybind" : "r"
}