From d8f781cb2787f3d4b03cf9fca6620d7c082c1779 Mon Sep 17 00:00:00 2001 From: hesam-init Date: Fri, 28 Jun 2024 13:16:38 +0330 Subject: [PATCH] feat: structure for eww dots --- .../eww/{ => assets}/image/desktop/amogus.png | Bin .../eww/{ => assets}/image/desktop/cirno.png | Bin .../eww/{ => assets}/image/desktop/koishi.png | Bin .../eww/{ => assets}/image/desktop/marisa.png | Bin .../eww/{ => assets}/image/desktop/reisen.png | Bin .../eww/{ => assets}/image/emptympd.png | Bin .../eww/{ => assets}/image/eyedropper.png | Bin .../eww/{ => assets}/image/fieshidle.gif | Bin .../hyprland/eww/{ => assets}/image/idk.svg | 0 .../eww/{ => assets}/image/loading.gif | Bin .../eww/{ => assets}/image/roundpfp.png | Bin .../eww/{ => assets}/image/screenshot.png | Bin .../{ => assets}/image/weather/clear-n.svg | 0 .../eww/{ => assets}/image/weather/clear.svg | 0 .../eww/{ => assets}/image/weather/clouds.svg | 0 .../image/weather/few-clouds-n.svg | 0 .../{ => assets}/image/weather/few-clouds.svg | 0 .../eww/{ => assets}/image/weather/fog.svg | 0 .../eww/{ => assets}/image/weather/idk.svg | 0 .../{ => assets}/image/weather/rain-light.svg | 0 .../eww/{ => assets}/image/weather/rain.svg | 0 .../eww/{ => assets}/image/weather/snow.svg | 0 .../eww/{ => assets}/image/weather/storm.svg | 0 .../eww/{ => assets}/themes/biscuit.scss | 0 .../{ => assets}/themes/biscuit_light.scss | 0 .../eww/{ => assets}/themes/camellia.scss | 0 .../eww/{ => assets}/themes/catppuccin.scss | 0 .../{ => assets}/themes/catppuccin_latte.scss | 0 .../eww/{ => assets}/themes/everblush.scss | 0 .../eww/{ => assets}/themes/fullerene.scss | 0 .../eww/{ => assets}/themes/oxocarbon.scss | 0 .../{ => assets}/themes/oxocarbon_light.scss | 0 .../eww/{ => assets}/themes/rosepine.scss | 0 .../eww/{ => assets}/themes/swamp.scss | 0 hypr-configs/hyprland/eww/colors.scss | 2 +- .../hyprland/eww/dashboard/dashboard.scss | 20 -- hypr-configs/hyprland/eww/eww.scss | 14 +- hypr-configs/hyprland/eww/eww.yuck | 90 +----- .../eww/notification/notification.yuck | 86 +++--- .../hyprland/eww/src/_definitions.yuck | 97 +++++++ hypr-configs/hyprland/eww/src/_listeners.yuck | 0 hypr-configs/hyprland/eww/src/_pollers.yuck | 16 -- hypr-configs/hyprland/eww/src/_variables.yuck | 13 - .../bar.yuck => src/bottom-bar/main.yuck} | 197 ++++++------- .../bottom-bar}/sidectl.yuck | 260 +++++++++--------- .../bar.scss => src/bottom-bar/styles.scss} | 0 .../control-panel/main.yuck} | 14 +- .../control-panel/styles.scss} | 0 .../control-panel}/windowswitcher.yuck | 32 +-- .../dashboard/main.yuck} | 3 +- .../hyprland/eww/src/dashboard/styles.scss | 19 ++ .../desktop.yuck => src/desktop/main.yuck} | 4 +- .../desktop.scss => src/desktop/styles.scss} | 0 .../{dock/dock.yuck => src/dock/main.yuck} | 0 .../{dock/dock.scss => src/dock/styles.scss} | 0 .../eww/src/{bar => sidebar}/main.yuck | 20 +- .../eww/src/{bar => sidebar}/styles.scss | 0 .../wallpapers/main.yuck} | 3 +- 58 files changed, 445 insertions(+), 445 deletions(-) rename hypr-configs/hyprland/eww/{ => assets}/image/desktop/amogus.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/desktop/cirno.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/desktop/koishi.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/desktop/marisa.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/desktop/reisen.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/emptympd.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/eyedropper.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/fieshidle.gif (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/idk.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/loading.gif (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/roundpfp.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/screenshot.png (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/clear-n.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/clear.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/clouds.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/few-clouds-n.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/few-clouds.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/fog.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/idk.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/rain-light.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/rain.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/snow.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/image/weather/storm.svg (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/biscuit.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/biscuit_light.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/camellia.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/catppuccin.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/catppuccin_latte.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/everblush.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/fullerene.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/oxocarbon.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/oxocarbon_light.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/rosepine.scss (100%) rename hypr-configs/hyprland/eww/{ => assets}/themes/swamp.scss (100%) delete mode 100644 hypr-configs/hyprland/eww/dashboard/dashboard.scss create mode 100644 hypr-configs/hyprland/eww/src/_definitions.yuck delete mode 100644 hypr-configs/hyprland/eww/src/_listeners.yuck delete mode 100644 hypr-configs/hyprland/eww/src/_pollers.yuck delete mode 100644 hypr-configs/hyprland/eww/src/_variables.yuck rename hypr-configs/hyprland/eww/{bottom_bar/bar.yuck => src/bottom-bar/main.yuck} (55%) rename hypr-configs/hyprland/eww/{bottom_bar => src/bottom-bar}/sidectl.yuck (53%) rename hypr-configs/hyprland/eww/{bottom_bar/bar.scss => src/bottom-bar/styles.scss} (100%) rename hypr-configs/hyprland/eww/{control_panel/control_panel.yuck => src/control-panel/main.yuck} (97%) rename hypr-configs/hyprland/eww/{control_panel/control_panel.scss => src/control-panel/styles.scss} (100%) rename hypr-configs/hyprland/eww/{control_panel => src/control-panel}/windowswitcher.yuck (72%) rename hypr-configs/hyprland/eww/{dashboard/dashboard.yuck => src/dashboard/main.yuck} (97%) create mode 100644 hypr-configs/hyprland/eww/src/dashboard/styles.scss rename hypr-configs/hyprland/eww/{desktop/desktop.yuck => src/desktop/main.yuck} (90%) rename hypr-configs/hyprland/eww/{desktop/desktop.scss => src/desktop/styles.scss} (100%) rename hypr-configs/hyprland/eww/{dock/dock.yuck => src/dock/main.yuck} (100%) rename hypr-configs/hyprland/eww/{dock/dock.scss => src/dock/styles.scss} (100%) rename hypr-configs/hyprland/eww/src/{bar => sidebar}/main.yuck (93%) rename hypr-configs/hyprland/eww/src/{bar => sidebar}/styles.scss (100%) rename hypr-configs/hyprland/eww/{wallpapers/wallpapers.yuck => src/wallpapers/main.yuck} (96%) diff --git a/hypr-configs/hyprland/eww/image/desktop/amogus.png b/hypr-configs/hyprland/eww/assets/image/desktop/amogus.png similarity index 100% rename from hypr-configs/hyprland/eww/image/desktop/amogus.png rename to hypr-configs/hyprland/eww/assets/image/desktop/amogus.png diff --git a/hypr-configs/hyprland/eww/image/desktop/cirno.png b/hypr-configs/hyprland/eww/assets/image/desktop/cirno.png similarity index 100% rename from hypr-configs/hyprland/eww/image/desktop/cirno.png rename to hypr-configs/hyprland/eww/assets/image/desktop/cirno.png diff --git a/hypr-configs/hyprland/eww/image/desktop/koishi.png b/hypr-configs/hyprland/eww/assets/image/desktop/koishi.png similarity index 100% rename from hypr-configs/hyprland/eww/image/desktop/koishi.png rename to hypr-configs/hyprland/eww/assets/image/desktop/koishi.png diff --git a/hypr-configs/hyprland/eww/image/desktop/marisa.png b/hypr-configs/hyprland/eww/assets/image/desktop/marisa.png similarity index 100% rename from hypr-configs/hyprland/eww/image/desktop/marisa.png rename to hypr-configs/hyprland/eww/assets/image/desktop/marisa.png diff --git a/hypr-configs/hyprland/eww/image/desktop/reisen.png b/hypr-configs/hyprland/eww/assets/image/desktop/reisen.png similarity index 100% rename from hypr-configs/hyprland/eww/image/desktop/reisen.png rename to hypr-configs/hyprland/eww/assets/image/desktop/reisen.png diff --git a/hypr-configs/hyprland/eww/image/emptympd.png b/hypr-configs/hyprland/eww/assets/image/emptympd.png similarity index 100% rename from hypr-configs/hyprland/eww/image/emptympd.png rename to hypr-configs/hyprland/eww/assets/image/emptympd.png diff --git a/hypr-configs/hyprland/eww/image/eyedropper.png b/hypr-configs/hyprland/eww/assets/image/eyedropper.png similarity index 100% rename from hypr-configs/hyprland/eww/image/eyedropper.png rename to hypr-configs/hyprland/eww/assets/image/eyedropper.png diff --git a/hypr-configs/hyprland/eww/image/fieshidle.gif b/hypr-configs/hyprland/eww/assets/image/fieshidle.gif similarity index 100% rename from hypr-configs/hyprland/eww/image/fieshidle.gif rename to hypr-configs/hyprland/eww/assets/image/fieshidle.gif diff --git a/hypr-configs/hyprland/eww/image/idk.svg b/hypr-configs/hyprland/eww/assets/image/idk.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/idk.svg rename to hypr-configs/hyprland/eww/assets/image/idk.svg diff --git a/hypr-configs/hyprland/eww/image/loading.gif b/hypr-configs/hyprland/eww/assets/image/loading.gif similarity index 100% rename from hypr-configs/hyprland/eww/image/loading.gif rename to hypr-configs/hyprland/eww/assets/image/loading.gif diff --git a/hypr-configs/hyprland/eww/image/roundpfp.png b/hypr-configs/hyprland/eww/assets/image/roundpfp.png similarity index 100% rename from hypr-configs/hyprland/eww/image/roundpfp.png rename to hypr-configs/hyprland/eww/assets/image/roundpfp.png diff --git a/hypr-configs/hyprland/eww/image/screenshot.png b/hypr-configs/hyprland/eww/assets/image/screenshot.png similarity index 100% rename from hypr-configs/hyprland/eww/image/screenshot.png rename to hypr-configs/hyprland/eww/assets/image/screenshot.png diff --git a/hypr-configs/hyprland/eww/image/weather/clear-n.svg b/hypr-configs/hyprland/eww/assets/image/weather/clear-n.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/clear-n.svg rename to hypr-configs/hyprland/eww/assets/image/weather/clear-n.svg diff --git a/hypr-configs/hyprland/eww/image/weather/clear.svg b/hypr-configs/hyprland/eww/assets/image/weather/clear.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/clear.svg rename to hypr-configs/hyprland/eww/assets/image/weather/clear.svg diff --git a/hypr-configs/hyprland/eww/image/weather/clouds.svg b/hypr-configs/hyprland/eww/assets/image/weather/clouds.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/clouds.svg rename to hypr-configs/hyprland/eww/assets/image/weather/clouds.svg diff --git a/hypr-configs/hyprland/eww/image/weather/few-clouds-n.svg b/hypr-configs/hyprland/eww/assets/image/weather/few-clouds-n.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/few-clouds-n.svg rename to hypr-configs/hyprland/eww/assets/image/weather/few-clouds-n.svg diff --git a/hypr-configs/hyprland/eww/image/weather/few-clouds.svg b/hypr-configs/hyprland/eww/assets/image/weather/few-clouds.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/few-clouds.svg rename to hypr-configs/hyprland/eww/assets/image/weather/few-clouds.svg diff --git a/hypr-configs/hyprland/eww/image/weather/fog.svg b/hypr-configs/hyprland/eww/assets/image/weather/fog.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/fog.svg rename to hypr-configs/hyprland/eww/assets/image/weather/fog.svg diff --git a/hypr-configs/hyprland/eww/image/weather/idk.svg b/hypr-configs/hyprland/eww/assets/image/weather/idk.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/idk.svg rename to hypr-configs/hyprland/eww/assets/image/weather/idk.svg diff --git a/hypr-configs/hyprland/eww/image/weather/rain-light.svg b/hypr-configs/hyprland/eww/assets/image/weather/rain-light.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/rain-light.svg rename to hypr-configs/hyprland/eww/assets/image/weather/rain-light.svg diff --git a/hypr-configs/hyprland/eww/image/weather/rain.svg b/hypr-configs/hyprland/eww/assets/image/weather/rain.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/rain.svg rename to hypr-configs/hyprland/eww/assets/image/weather/rain.svg diff --git a/hypr-configs/hyprland/eww/image/weather/snow.svg b/hypr-configs/hyprland/eww/assets/image/weather/snow.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/snow.svg rename to hypr-configs/hyprland/eww/assets/image/weather/snow.svg diff --git a/hypr-configs/hyprland/eww/image/weather/storm.svg b/hypr-configs/hyprland/eww/assets/image/weather/storm.svg similarity index 100% rename from hypr-configs/hyprland/eww/image/weather/storm.svg rename to hypr-configs/hyprland/eww/assets/image/weather/storm.svg diff --git a/hypr-configs/hyprland/eww/themes/biscuit.scss b/hypr-configs/hyprland/eww/assets/themes/biscuit.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/biscuit.scss rename to hypr-configs/hyprland/eww/assets/themes/biscuit.scss diff --git a/hypr-configs/hyprland/eww/themes/biscuit_light.scss b/hypr-configs/hyprland/eww/assets/themes/biscuit_light.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/biscuit_light.scss rename to hypr-configs/hyprland/eww/assets/themes/biscuit_light.scss diff --git a/hypr-configs/hyprland/eww/themes/camellia.scss b/hypr-configs/hyprland/eww/assets/themes/camellia.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/camellia.scss rename to hypr-configs/hyprland/eww/assets/themes/camellia.scss diff --git a/hypr-configs/hyprland/eww/themes/catppuccin.scss b/hypr-configs/hyprland/eww/assets/themes/catppuccin.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/catppuccin.scss rename to hypr-configs/hyprland/eww/assets/themes/catppuccin.scss diff --git a/hypr-configs/hyprland/eww/themes/catppuccin_latte.scss b/hypr-configs/hyprland/eww/assets/themes/catppuccin_latte.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/catppuccin_latte.scss rename to hypr-configs/hyprland/eww/assets/themes/catppuccin_latte.scss diff --git a/hypr-configs/hyprland/eww/themes/everblush.scss b/hypr-configs/hyprland/eww/assets/themes/everblush.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/everblush.scss rename to hypr-configs/hyprland/eww/assets/themes/everblush.scss diff --git a/hypr-configs/hyprland/eww/themes/fullerene.scss b/hypr-configs/hyprland/eww/assets/themes/fullerene.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/fullerene.scss rename to hypr-configs/hyprland/eww/assets/themes/fullerene.scss diff --git a/hypr-configs/hyprland/eww/themes/oxocarbon.scss b/hypr-configs/hyprland/eww/assets/themes/oxocarbon.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/oxocarbon.scss rename to hypr-configs/hyprland/eww/assets/themes/oxocarbon.scss diff --git a/hypr-configs/hyprland/eww/themes/oxocarbon_light.scss b/hypr-configs/hyprland/eww/assets/themes/oxocarbon_light.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/oxocarbon_light.scss rename to hypr-configs/hyprland/eww/assets/themes/oxocarbon_light.scss diff --git a/hypr-configs/hyprland/eww/themes/rosepine.scss b/hypr-configs/hyprland/eww/assets/themes/rosepine.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/rosepine.scss rename to hypr-configs/hyprland/eww/assets/themes/rosepine.scss diff --git a/hypr-configs/hyprland/eww/themes/swamp.scss b/hypr-configs/hyprland/eww/assets/themes/swamp.scss similarity index 100% rename from hypr-configs/hyprland/eww/themes/swamp.scss rename to hypr-configs/hyprland/eww/assets/themes/swamp.scss diff --git a/hypr-configs/hyprland/eww/colors.scss b/hypr-configs/hyprland/eww/colors.scss index 154ffec..b589b81 100644 --- a/hypr-configs/hyprland/eww/colors.scss +++ b/hypr-configs/hyprland/eww/colors.scss @@ -1 +1 @@ -@import "./themes/everblush.scss"; +@import "./assets/themes/everblush.scss"; diff --git a/hypr-configs/hyprland/eww/dashboard/dashboard.scss b/hypr-configs/hyprland/eww/dashboard/dashboard.scss deleted file mode 100644 index 520ab90..0000000 --- a/hypr-configs/hyprland/eww/dashboard/dashboard.scss +++ /dev/null @@ -1,20 +0,0 @@ - -.heading { - font-size: 25px; - color: $accent; - margin: 5px; -} - -.dmpdcontrol { - margin: 10px; -} - -.dmpdcontrol label { - font-size: 20px; - margin: 0px 8px; -} - -.dicons label { - font-size: 25px; - margin-right: 6px; -} diff --git a/hypr-configs/hyprland/eww/eww.scss b/hypr-configs/hyprland/eww/eww.scss index 4e7e0b3..1aa0f25 100644 --- a/hypr-configs/hyprland/eww/eww.scss +++ b/hypr-configs/hyprland/eww/eww.scss @@ -1,11 +1,11 @@ @import "./colors.scss"; -@import "./src/bar/styles.scss"; -// @import "./bottom_bar/bar.scss"; -@import "./control_panel/control_panel.scss"; -@import "./dashboard/dashboard.scss"; -@import "./dock/dock.scss"; -@import "./desktop/desktop.scss"; +@import "./src/sidebar/styles.scss"; +@import "./src/control-panel/styles.scss"; +@import "./src/dashboard/styles.scss"; +@import "./src/dock/styles.scss"; +@import "./src/desktop/styles.scss"; @import "./notification/notification.scss"; +// @import "./src/bottom-bar/styles.scss"; * { all: unset; @@ -110,7 +110,7 @@ checkbutton:checked { } entry { - // image: url('./image/screenshot.png'); + // image: url('./assets/image/screenshot.png'); padding: 5px; margin: 5px; border-radius: 5px; diff --git a/hypr-configs/hyprland/eww/eww.yuck b/hypr-configs/hyprland/eww/eww.yuck index ecd3cec..13a6121 100644 --- a/hypr-configs/hyprland/eww/eww.yuck +++ b/hypr-configs/hyprland/eww/eww.yuck @@ -1,48 +1,5 @@ (include "./src/utils/_revealer.yuck") -(include "./src/_pollers.yuck") -(include "./src/_variables.yuck") - -(deflisten workspacejson - :initial '[{"focused": true, "empty": false, "name": 1}, {"focused": false, "empty": true, "name": 2}, {"focused": false, "empty": true, "name": 3}, {"focused": false, "empty": true, "name": 4}, {"focused": false, "empty": true, "name": 5}]' -"./scripts/workspace.py") - -;; used mainly in control panel and dashboard -(defpoll hostname :initial "idk" :interval "24h" 'echo "$(whoami)"') -(defpoll uptime :initial "idk" :interval "1m" "uptime -p") -(defpoll weatherjson - :initial '{ - "FeelsLikeC": "0", - "FeelsLikeF": "0", - "cloudcover": "0", - "humidity": "0", - "localObsDateTime": "2000-00-00 07:27 AM", - "observation_time": "07:27 AM", - "precipInches": "0.0", - "precipMM": "0.0", - "pressure": "0", - "pressureInches": "0", - "temp_C": "0", - "temp_F": "0", - "uvIndex": "0", - "visibility": "0", - "visibilityMiles": "0", - "weatherCode": "727", - "weatherDesc": [{"value": "Idk"}], - "weatherIconUrl": [{"value": ""}], - "winddir16Point": "", - "winddirDegree": "0", - "windspeedKmph": "0", - "windspeedMiles": "0", - "icon": "idk", - "hourly": [] - }' - :interval "1h" - :run-while revealcontrolpanel -"./scripts/weather.py") -(defpoll datehour :initial "12" :interval "30m" "date +'%H'") -(defpoll notesc :interval "2s" :run-while reveal4 "cat -s ~/Documents/fuck.txt") -(defpoll quotejson :interval "1h" `./scripts/quote.py`) -(deflisten timerdis `./scripts/timer.py subscribe`) +(include "./src/_definitions.yuck") ;; dock (deflisten tasksjson :initial "[]" "./scripts/tasklist.py") @@ -59,33 +16,9 @@ (defvar borderpixel 2) (defvar caffeine false) -; Notifications -(deflisten notifications :initial '{ - "count": 0, - "dnd": false, - "notifications": [], - "popups": [] - }' - "./scripts/notifCatch" -) - ;; cava pipe ("borrowed from tail-r") ;; (deflisten cavajson :initial "[]" "./scripts/cava_pipe.sh") -;; playerctl -(deflisten psong "playerctl metadata --format '{{ title }}' -F") -(deflisten partist "playerctl metadata --format '{{ artist }}' -F") -(deflisten pcover "./scripts/pollcover.sh") -(deflisten pstatus "playerctl status -F") -(deflisten ptime - :initial '{ - "position": 0, - "duration": 0, - "readable": "0:00" - }' - "playerctl -F metadata -f '{ \"position\": {{position/1000000}}, \"duration\": {{mpris:length/1000000}}, \"readable\": \"{{duration(position)}}/{{duration(mpris:length)}}\" }'") -;; (deflisten pside "playerctl -F metadata -f '{ \"volume\": {{volume*100}}, \"shuffle\": \"{{shuffle}}\", \"loop\": \"{{loop}}\" }'") - ;; wallpaper thing (defvar wallpapers "[]") @@ -94,11 +27,18 @@ (defpoll theme :interval "24h" "./scripts/toggletheme") -(include "./src/bar/main.yuck") -;; (include "./bottom_bar/bar.yuck") -(include "./control_panel/control_panel.yuck") -(include "./dashboard/dashboard.yuck") -(include "./dock/dock.yuck") -(include "./desktop/desktop.yuck") +;; (include "./src/bottom_bar/bar.yuck") +(include "./src/sidebar/main.yuck") + +(include "./src/control-panel/main.yuck") +(include "./src/control-panel/windowswitcher.yuck") + +(include "./src/wallpapers/main.yuck") + +(include "./src/dashboard/main.yuck") + +(include "./src/dock/main.yuck") + +(include "./src/desktop/main.yuck") + (include "./notification/notification.yuck") -(include "./wallpapers/wallpapers.yuck") diff --git a/hypr-configs/hyprland/eww/notification/notification.yuck b/hypr-configs/hyprland/eww/notification/notification.yuck index 0be847f..c5935f3 100644 --- a/hypr-configs/hyprland/eww/notification/notification.yuck +++ b/hypr-configs/hyprland/eww/notification/notification.yuck @@ -1,11 +1,11 @@ -(defwindow notifypopup +(defwindow notifypopup :geometry (geometry - :x 0 - :y 0 - :width 480 - :height 0 - :anchor "top right") + :x 0 + :y 0 + :width 480 + :height 0 + :anchor "top right") :stacking "overlay" :monitor 0 (revealer @@ -13,78 +13,78 @@ :transition "slidedown" (box :orientation "v" - :space-evenly false + :space-evenly false :spacing 5 (for noti in {notifications.popups} (singlenotif :noti noti :initial true))))) (defwidget singlenotif [noti initial] - (box + (box :orientation "v" :class "${initial ? 'popup' : 'notifbox'}" - :space-evenly false - - (centerbox + :space-evenly false + + (centerbox :orientation "h" :class "notifbar" - (image :halign "start" :image-width 30 :image-height 30 :path {noti.icon != "null" ? noti.icon : "./image/idk.svg"}) - (scroll + (image :halign "start" :image-width 30 :image-height 30 :path {noti.icon != "null" ? noti.icon : "./assets/image/idk.svg"}) + (scroll :halign "center" :valign "center" :hexpand true :hscroll true - :vscroll false + :vscroll false :width 200 - (label + (label :class "notiflabel" - :text {noti.app})) - (button + :text {noti.app})) + (button :halign "end" :onclick "./scripts/notifManage --close ${noti.id}" - (label + (label :class "notifclose" - :text ""))) - - (box + :text ""))) + + (box :orientation "h" :halign "fill" :height 80 :space-evenly false :spacing 10 - (image :image-width 80 :image-height 80 :visible {noti.image != "null"} :path {noti.image != "null" ? noti.image : "./image/idk.svg"}) - - (button + (image :image-width 80 :image-height 80 :visible {noti.image != "null"} :path {noti.image != "null" ? noti.image : "./assets/image/idk.svg"}) + + (button :onclick "./scripts/notifManage --dismiss ${noti.id}" :onrightclick "./scripts/notifManage --close ${noti.id}" :tooltip "${noti.time}" :hexpand true :vexpand true - (box - :orientation "v" - :space-evenly false + (box + :orientation "v" + :space-evenly false :valign "center" (scroll - :hscroll true + :hscroll true :vscroll false :hexpand true - (label - :class "notiftitle" - :text {noti.summary})) - (scroll - :hscroll true - :vscroll false - :hexpand true - (label - :class "notifbody" - :visible {noti.body != "null"} - :text {noti.body}))))) - + (label + :class "notiftitle" + :text {noti.summary})) + (scroll + :hscroll true + :vscroll false + :hexpand true + (label + :class "notifbody" + :visible {noti.body != "null"} + :text {noti.body}))))) + (box :orientation "h" (for action in {noti.actions} (button :onclick "./scripts/notifManage --action ${noti.id} ${action[0]} && ./scripts/notifManage --close ${noti.id}" - (label + (label :class "notifactions" - :text {action[1]})) - )))) + :text {action[1]})) + )))) diff --git a/hypr-configs/hyprland/eww/src/_definitions.yuck b/hypr-configs/hyprland/eww/src/_definitions.yuck new file mode 100644 index 0000000..a549e15 --- /dev/null +++ b/hypr-configs/hyprland/eww/src/_definitions.yuck @@ -0,0 +1,97 @@ +(defvar revealVolume false) +(defvar revealMicrophone false) +(defvar revealBrightness false) +(defvar revealControlpanel false) +(defvar reveal1 false) +(defvar reveal2 false) +(defvar reveal3 false) +(defvar reveal4 false) +(defvar reveal5 false) +(defvar reveal6 false) +(defvar revealweather false) +(defvar revealsystray false) + +; Workspaces +(defvar show_no_of_windows false) +(deflisten workspacesjson :initial "[]" "./scripts/workspaces get-all-workspaces") +(defpoll current_workspace :initial "0" :interval "50ms" "./scripts/workspaces get-active-workspace") + +; Notifications +(deflisten notifications :initial '{ + "count": 0, + "dnd": false, + "notifications": [], + "popups": [] + }' + "./scripts/notifCatch" +) + +; Playerctl +(deflisten psong "playerctl metadata --format '{{ title }}' -F") +(deflisten partist "playerctl metadata --format '{{ artist }}' -F") +(deflisten pcover "./scripts/pollcover.sh") +(deflisten pstatus "playerctl status -F") +(deflisten ptime + :initial '{ + "position": 0, + "duration": 0, + "readable": "0:00" + }' + "playerctl -F metadata -f '{ \"position\": {{position/1000000}}, \"duration\": {{mpris:length/1000000}}, \"readable\": \"{{duration(position)}}/{{duration(mpris:length)}}\" }'") +;; (deflisten pside "playerctl -F metadata -f '{ \"volume\": {{volume*100}}, \"shuffle\": \"{{shuffle}}\", \"loop\": \"{{loop}}\" }'") + + +(defpoll thour :initial "0" :interval "60s" "date +'%I'") +(defpoll tmin :initial "0" :interval "60s" "date +'%M'") +(defpoll tpm :initial "0" :interval "60s" "date +'%p'") +(defpoll volumemute :initial "false" :interval "1s" "pamixer --get-mute") +(defpoll volume :initial "0" :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | tr -d '%'") +(defpoll mic_volume :initial "0" :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk '{print $5}' | tr -d '%'") +(defpoll brightness :initial "0" :interval "2s" "brightnessctl -m | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'") +(defpoll wifi_icon :initial "" :interval "30s" "./scripts/wifi --ICON") +(defpoll wifi_essid :initial "" :interval "30s" "./scripts/wifi --ESSID") +(defpoll wifi_radio :initial "off" :interval "2s" "nmcli radio wifi") +(defpoll calendar_day :initial "1" :interval "20h" "date '+%d'") +(defpoll calendar_year :initial "2000" :interval "20h" "date '+%Y'") +(defpoll bat0 :initial "0" :interval "30s" "bash ./scripts/sys_info --bat") +(defpoll baticon :initial "" :interval "30s" "bash ./scripts/sys_info --baticon") +(defpoll batstat :interval "30s" "cat /sys/class/power_supply/BAT0/status") +(defpoll homedir :initial "" :interval "24h" "echo ~") + +; Controlpanel +(defpoll hostname :initial "idk" :interval "24h" 'echo "$(whoami)"') +(defpoll uptime :initial "idk" :interval "1m" "uptime -p") +(deflisten timerdis "./scripts/timer.py subscribe") +(defpoll weatherjson + :initial '{ + "FeelsLikeC": "0", + "FeelsLikeF": "0", + "cloudcover": "0", + "humidity": "0", + "localObsDateTime": "2000-00-00 07:27 AM", + "observation_time": "07:27 AM", + "precipInches": "0.0", + "precipMM": "0.0", + "pressure": "0", + "pressureInches": "0", + "temp_C": "0", + "temp_F": "0", + "uvIndex": "0", + "visibility": "0", + "visibilityMiles": "0", + "weatherCode": "727", + "weatherDesc": [{"value": "Idk"}], + "weatherIconUrl": [{"value": ""}], + "winddir16Point": "", + "winddirDegree": "0", + "windspeedKmph": "0", + "windspeedMiles": "0", + "icon": "idk", + "hourly": [] + }' + :interval "1h" + :run-while revealcontrolpanel +"./scripts/weather.py") +(defpoll datehour :initial "12" :interval "30m" "date +'%H'") +(defpoll notesc :interval "2s" :run-while reveal4 "cat -s ~/Documents/fuck.txt") +(defpoll quotejson :interval "1h" `./scripts/quote.py`) \ No newline at end of file diff --git a/hypr-configs/hyprland/eww/src/_listeners.yuck b/hypr-configs/hyprland/eww/src/_listeners.yuck deleted file mode 100644 index e69de29..0000000 diff --git a/hypr-configs/hyprland/eww/src/_pollers.yuck b/hypr-configs/hyprland/eww/src/_pollers.yuck deleted file mode 100644 index 0bf495c..0000000 --- a/hypr-configs/hyprland/eww/src/_pollers.yuck +++ /dev/null @@ -1,16 +0,0 @@ -(defpoll thour :initial "0" :interval "60s" "date +'%I'") -(defpoll tmin :initial "0" :interval "60s" "date +'%M'") -(defpoll tpm :initial "0" :interval "60s" "date +'%p'") -(defpoll volumemute :initial "false" :interval "1s" "pamixer --get-mute") -(defpoll volume :initial "0" :interval "1s" "pactl get-sink-volume @DEFAULT_SINK@ | awk '{print $5}' | tr -d '%'") -(defpoll mic_volume :initial "0" :interval "1s" "pactl get-source-volume @DEFAULT_SOURCE@ | awk '{print $5}' | tr -d '%'") -(defpoll brightness :initial "0" :interval "2s" "brightnessctl -m | awk -F, '{print substr($4, 0, length($4)-1)}' | tr -d '%'") -(defpoll wifi_icon :initial "" :interval "30s" "./scripts/wifi --ICON") -(defpoll wifi_essid :initial "" :interval "30s" "./scripts/wifi --ESSID") -(defpoll wifi_radio :initial "off" :interval "2s" "nmcli radio wifi") -(defpoll calendar_day :initial "1" :interval "20h" "date '+%d'") -(defpoll calendar_year :initial "2000" :interval "20h" "date '+%Y'") -(defpoll bat0 :initial "0" :interval "30s" "bash ./scripts/sys_info --bat") -;; (defpoll baticon :initial "" :interval "30s" "bash ./scripts/sys_info --baticon") -;; (defpoll batstat :interval "30s" "cat /sys/class/power_supply/BAT0/status") -(defpoll homedir :initial "" :interval "24h" "echo ~") diff --git a/hypr-configs/hyprland/eww/src/_variables.yuck b/hypr-configs/hyprland/eww/src/_variables.yuck deleted file mode 100644 index 94ed083..0000000 --- a/hypr-configs/hyprland/eww/src/_variables.yuck +++ /dev/null @@ -1,13 +0,0 @@ -(defvar revealVolume false) -(defvar revealMicrophone false) -(defvar revealBrightness false) - -(defvar reveal1 false) -(defvar reveal2 false) -(defvar reveal3 false) -(defvar reveal4 false) -(defvar reveal5 false) -(defvar reveal6 false) -(defvar revealweather false) -(defvar revealsystray false) -(defvar revealcontrolpanel false) \ No newline at end of file diff --git a/hypr-configs/hyprland/eww/bottom_bar/bar.yuck b/hypr-configs/hyprland/eww/src/bottom-bar/main.yuck similarity index 55% rename from hypr-configs/hyprland/eww/bottom_bar/bar.yuck rename to hypr-configs/hyprland/eww/src/bottom-bar/main.yuck index a0706de..5f1f0ad 100644 --- a/hypr-configs/hyprland/eww/bottom_bar/bar.yuck +++ b/hypr-configs/hyprland/eww/src/bottom-bar/main.yuck @@ -1,45 +1,47 @@ +(include "./src/bottom-bar/sidectl.yuck") + (defwindow bar :geometry (geometry - :x "0%" - :y "0%" - :width "100%" - :height 40 - :anchor "bottom center") - :exclusive true - :monitor 0 - :wm-ignore false + :x "0%" + :y "0%" + :width "100%" + :height 40 + :anchor "bottom center") + :exclusive true + :monitor 0 + :wm-ignore false (barstruct)) (defwidget barstruct [] - ;; (box - ;; :orientation "v" - ;; :space-evenly false - (centerbox + ;; (box + ;; :orientation "v" + ;; :space-evenly false + (centerbox :class "barwidget" :orientation "h" :height 60 (left) (middle) (right)) - ;; (revealer - ;; :transition "slideup" - ;; :reveal revealcontrolpanel - ;; (box - ;; :class "barwidget" - ;; :orientation "h" - ;; :space-evenly false - ;; (box - ;; :orientation "v" - ;; :space-evenly false - ;; (user) - ;; (chooser)) - ;; (overview) - ;; (timer) - ;; (touchpad) - ;; ))) - ) + ;; (revealer + ;; :transition "slideup" + ;; :reveal revealcontrolpanel + ;; (box + ;; :class "barwidget" + ;; :orientation "h" + ;; :space-evenly false + ;; (box + ;; :orientation "v" + ;; :space-evenly false + ;; (user) + ;; (chooser)) + ;; (overview) + ;; (timer) + ;; (touchpad) + ;; ))) +) -(defwidget left [] +(defwidget left [] (box :orientation "h" :space-evenly false @@ -48,30 +50,30 @@ (home) (workspaces) ;; (cavapipe) - )) + )) -(defwidget middle [] +(defwidget middle [] (box :orientation "h" - :space-evenly false + :space-evenly false :halign "center" :valign "fill" (tasklist :iconsize 42) - )) + )) -(defwidget right [] +(defwidget right [] (box :orientation "h" :space-evenly false :halign "end" :valign "fill" - (button :class "widget" :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false" - (label :class "icon" :style "padding-left: 3px;" :text "󰌌")) + (button :class "widget" :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false" + (label :class "icon" :style "padding-left: 3px;" :text "󰌌")) (playerctl) (sysicons) ;; (battery) (clock) - )) + )) (defwidget workspaces [] (eventbox @@ -90,126 +92,125 @@ :class { workspacejson[i].focused ? "workspacethingactive" : "workspacething"} :orientation "h" :space-evenly false - (box - :width 50) - (revealer + (box + :width 50) + (revealer :reveal { !workspacejson[i].empty || workspacejson[i].focused } :transition "slideright" - (box - :width 30)) - (revealer + (box + :width 30)) + (revealer :reveal { workspacejson[i].focused } :transition "slideright" - (box - :width 20)) - )))))) + (box + :width 20)) + )))))) (defwidget clock [] (box :orientation "h" :class "clock widget" :space-evenly false - (button + (button :onclick "${EWW_CMD} update reveal1=${!reveal1} reveal2=false reveal3=false" (label :text "${thour}:${tmin} ${tpm}")))) (defwidget sysicons [] - (box + (box :class "widget" :valign "fill" - (button - :onclick "${EWW_CMD} update reveal1=false reveal2=${!reveal2} reveal3=false" + (button + :onclick "${EWW_CMD} update reveal1=false reveal2=${!reveal2} reveal3=false" :class "icon" - (box + (box :orientation "h" - :space-evenly false - :spacing 5 + :space-evenly false + :spacing 5 (label :tooltip wifi_essid :class "icon" :text wifi_icon) (label :tooltip "${volume}%" :class "icon" :text {volumemute == 'false' ? "󰕾" : "󰖁"}) (overlay - :tooltip "${bat0}%" + :tooltip "${bat0}%" (label :class "icon" :text "") - (scale + (scale :hexpand false :orientation "h" :active false - :min 0 - :max 100 + :min 0 + :max 100 :value bat0 - :class "overbat ${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging' : ''}")) - )))) + :class "overbat ${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging' : ''}")) + )))) (defwidget battery [] (box :orientation "h" - :space-evenly false + :space-evenly false :class "widget" (overlay - (scale + (scale :class "${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging': bat0 < 16 ? 'dying': 'normal'} bat_scale" :value "${bat0}" :orientation "h" - :max 100 + :max 100 :min 0 :flipped true - :active false) - (label + :active false) + (label :class "lightning" :visible {EWW_BATTERY.BAT0.status == "Charging"} - :text "󱐋")) + :text "󱐋")) (label :text "${bat0}%"))) -(defwidget playerctl [] +(defwidget playerctl [] (overlay (box :halign "fill" :width 150 :class { pcover != "" ? "mpdcover" : "widget"} :style "background-image: url('${pcover}')") - (box + (box ;; :class "widget" :orientation "h" :space-evenly false :spacing 5 :halign "center" :valign "center" - (eventbox + (eventbox :onclick "${EWW_CMD} update reveal1=false reveal2=false reveal3=${!reveal3}" - (image :path { pcover == "" ? "./image/emptympd.png" : pcover } :image-width 30 :image-height 30 :style "padding: 0px 5px;")) - (button :onclick "playerctl previous" + (image :path { pcover == "" ? "./assets/image/emptympd.png" : pcover } :image-width 30 :image-height 30 :style "padding: 0px 5px;")) + (button :onclick "playerctl previous" (label :class "icon" :text "󰒮")) (button :onclick "playerctl play-pause" (label :class "icon" :text { pstatus == "Playing" ? "" : "" })) - (button :onclick "playerctl next" + (button :onclick "playerctl next" (label :class "icon" :text "󰒭")) - ))) + ))) (defwidget home [] - (box - :class "widget" - :hexpand false - :vexpand false - (eventbox - ;; :onclick "~/.config/eww/meowidgets/scripts/launch" - ;; :onclick "~/.config/eww/meowayland/scripts/launch" - ;; :onclick "./scripts/pop control" - :onclick "${EWW_CMD} update revealcontrolpanel=${ !revealcontrolpanel }" - :onrightclick "${EWW_CMD} open wallpaperselect --toggle" - :cursor "pointer" - (label :text "" :halign "center" :class "launchicon" :style "padding: 0px 4px;")))) + (box + :class "widget" + :hexpand false + :vexpand false + (eventbox + ;; :onclick "~/.config/eww/meowidgets/scripts/launch" + ;; :onclick "~/.config/eww/meowayland/scripts/launch" + ;; :onclick "./scripts/pop control" + :onclick "${EWW_CMD} update revealcontrolpanel=${ !revealcontrolpanel }" + :onrightclick "${EWW_CMD} open wallpaperselect --toggle" + :cursor "pointer" + (label :text "" :halign "center" :class "launchicon" :style "padding: 0px 4px;")))) ;; (defwidget cavapipe [] -;; (box -;; :class "widget" -;; :orientation "h" -;; :space-evenly true -;; (for bar in {cavajson} -;; (scale -;; :class "cavascale" -;; :orientation "v" -;; :value bar -;; :min 0 -;; :max 100 -;; :flipped true)))) + ;; (box + ;; :class "widget" + ;; :orientation "h" + ;; :space-evenly true + ;; (for bar in {cavajson} + ;; (scale + ;; :class "cavascale" + ;; :orientation "v" + ;; :value bar + ;; :min 0 + ;; :max 100 + ;; :flipped true)))) -(include "./bottom_bar/sidectl.yuck") diff --git a/hypr-configs/hyprland/eww/bottom_bar/sidectl.yuck b/hypr-configs/hyprland/eww/src/bottom-bar/sidectl.yuck similarity index 53% rename from hypr-configs/hyprland/eww/bottom_bar/sidectl.yuck rename to hypr-configs/hyprland/eww/src/bottom-bar/sidectl.yuck index 2db9e15..29bff2b 100644 --- a/hypr-configs/hyprland/eww/bottom_bar/sidectl.yuck +++ b/hypr-configs/hyprland/eww/src/bottom-bar/sidectl.yuck @@ -1,15 +1,15 @@ (defwindow sidectl1 :geometry (geometry - :x "0%" - :y "0%" - :width 320 - :height 0 - :anchor "bottom right") - :monitor 0 + :x "0%" + :y "0%" + :width 320 + :height 0 + :anchor "bottom right") + :monitor 0 :stacking "overlay" (revealer - :reveal reveal1 + :reveal reveal1 :transition "slideup" (box :orientation "v" @@ -18,31 +18,31 @@ (box :height 700 :class "popup" - (notiweathertoggle)) - + (notiweathertoggle)) + (box :class "popup" (box :class "unbarwidget" - (calendar - :day calendar_day - :year calendar_year - :class ""))) - ))) + (calendar + :day calendar_day + :year calendar_year + :class ""))) + ))) -(defwindow sidectl2 - :geometry (geometry - :x 50 - :y 0 - :width 200 - :height 0 - :anchor "bottom right") - :monitor 0 +(defwindow sidectl2 + :geometry (geometry + :x 50 + :y 0 + :width 200 + :height 0 + :anchor "bottom right") + :monitor 0 :stacking "overlay" - (revealer - :reveal reveal2 + (revealer + :reveal reveal2 :transition "slideup" - (box + (box :class "popup" :orientation "v" :space-evenly false @@ -50,131 +50,131 @@ :orientation "v" :class "widget" :spacing 20 - :space-evenly false - + :space-evenly false + (box :orientation "v" :height 150 - (box + (box :orientation "h" - (togglebuttons - :icon wifi_icon + (togglebuttons + :icon wifi_icon :class {wifi_radio == "enabled" ? "icontitlesel" : "icontitle"} :text {wifi_radio == "enabled" ? wifi_essid == "" ? "Disconnected" : "Connected" : "Off"} :subtext { wifi_essid == "" ? "..." : wifi_essid} - :toggle {wifi_radio == "enabled" ? "nmcli radio wifi off" : "nmcli radio wifi on"}) - - (togglebuttons + :toggle {wifi_radio == "enabled" ? "nmcli radio wifi off" : "nmcli radio wifi on"}) + + (togglebuttons :icon "" :class {caffeine ? "icontitlesel" : "icontitle"} :text "Caffeine" :subtext {caffeine ? "on" : "off"} - :toggle {caffeine ? "swaymsg [app_id='.*'] inhibit_idle none && ${EWW_CMD} update caffeine=false" : "swaymsg [app_id='.*'] inhibit_idle open && ${EWW_CMD} update caffeine=true"})) - + :toggle {caffeine ? "swaymsg [app_id='.*'] inhibit_idle none && ${EWW_CMD} update caffeine=false" : "swaymsg [app_id='.*'] inhibit_idle open && ${EWW_CMD} update caffeine=true"})) + (box :orientation "h" - (togglebuttons + (togglebuttons :icon "" :class "icontitle" :text "Theme" :subtext theme - :toggle "${EWW_CMD} update reveal2=false && ~/.config/eww/themeswitch/scripts/pop") - + :toggle "${EWW_CMD} update reveal2=false && ~/.config/eww/themeswitch/scripts/pop") + (togglebuttons :icon "" :class {notifications.dnd ? "icontitlesel" : "icontitle"} :text "Do not disturb" :subtext {notifications.dnd ? "on" : "off"} - :toggle "./scripts/notifManage --toggle") - )) - + :toggle "./scripts/notifManage --toggle") + )) + (sliderctl :icon {volumemute == 'false' ? "󰕾" : "󰖁"} :value volume :onchange "pamixer --set-volume {}") (sliderctl :icon "󰃞" :value brightness :onchange "brightnessctl set {}%") - + (box :orientation "h" - :space-evenly false + :space-evenly false :halign "end" (overlay - (scale + (scale :class "${EWW_BATTERY.BAT0.status == 'Charging' ? 'charging': bat0 < 16 ? 'dying': 'normal'} bat_scale" :value "${bat0}" :orientation "h" - :max 100 + :max 100 :min 0 - :active false) - (label + :active false) + (label :class "lightning" :visible {EWW_BATTERY.BAT0.status == "Charging"} - :text "󱐋")) + :text "󱐋")) (label :text "${bat0}%")) -)))) + )))) (defwidget togglebuttons [icon class text ?subtext toggle] - (button - :onclick toggle - (box + (button + :onclick toggle + (box :orientation "h" - :class class + :class class :space-evenly false - (label + (label :class "icon" :halign "start" - :text icon) - (box + :text icon) + (box :orientation "v" :hexpand true :halign "center" - (label - :text text) - (label + (label + :text text) + (label :limit-width 17 - :text subtext))))) + :text subtext))))) (defwidget sliderctl [icon value onchange] - (box + (box :orientation "h" :space-evenly false :hexpand true :spacing 5 - - (label + + (label :class "icon" :text icon - :style "margin-left: 5px;") - - (scale + :style "margin-left: 5px;") + + (scale :class "sliderctl" :orientation "h" :value value :tooltip "${value}%" :min 0 :max 100 - :onchange onchange))) + :onchange onchange))) (defwindow sidectl3 :geometry (geometry - :x 150 - :y 0 - :width 440 - :height 0 - :anchor "bottom right") - :monitor 0 + :x 150 + :y 0 + :width 440 + :height 0 + :anchor "bottom right") + :monitor 0 :stacking "overlay" (revealer :reveal reveal3 :transition "slideup" - (box + (box :class "popup" (box :orientation "h" :class "unbarwidget" - :space-evenly false + :space-evenly false :spacing 20 - (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./image/emptympd.png" : pcover }) + (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./assets/image/emptympd.png" : pcover }) (box :orientation "v" - :space-evenly false + :space-evenly false :width 210 :height 200 (scroll @@ -185,88 +185,88 @@ :hscroll true :vscroll false (label :class "mauthor" :text partist)) - (box + (box :orientation "h" :class "mpd_controls" :style "margin-top: 10px;" (button :onclick "playerctl previous" (label :text "󰒮")) - (button :onclick "playerctl play-pause" + (button :onclick "playerctl play-pause" (label :text { pstatus == "Playing" ? "" : ""} )) - (button :onclick "playerctl next" + (button :onclick "playerctl next" (label :text "󰒭"))) - (scale + (scale :class "seektime" :value { ptime.position } :orientation "h" :onchange "playerctl position {}" :min 0 :max { ptime.duration } - :tooltip { ptime.readable })) - ;; (box - ;; :orientation "v" - ;; :space-evenly false - ;; :valign "center" - ;; :halign "end" - ;; :class "sidempdctl" - ;; (scale - ;; :value { pside.volume } - ;; :orientation "v" - ;; :class "mpdvolumeseek" - ;; :onchange "playerctl volume {}" - ;; :min 0 - ;; :max 100 - ;; :flipped true - ;; :tooltip "volume: ${pside.volume}") - ;; (button - ;; :onclick "playerctl shuffle toggle" - ;; (label - ;; :text {pside.shuffle == "true" ? "󰒝" : "󰒞"})) - ;; (button - ;; :onclick "playerctl loop ${pside.loop == 'Track' ? 'Playlist' : 'Track'}" - ;; (label - ;; :text {pside.loop == "Track" ? "󰑘" : "󰑖"})) + :tooltip { ptime.readable })) + ;; (box + ;; :orientation "v" + ;; :space-evenly false + ;; :valign "center" + ;; :halign "end" + ;; :class "sidempdctl" + ;; (scale + ;; :value { pside.volume } + ;; :orientation "v" + ;; :class "mpdvolumeseek" + ;; :onchange "playerctl volume {}" + ;; :min 0 + ;; :max 100 + ;; :flipped true + ;; :tooltip "volume: ${pside.volume}") + ;; (button + ;; :onclick "playerctl shuffle toggle" + ;; (label + ;; :text {pside.shuffle == "true" ? "󰒝" : "󰒞"})) + ;; (button + ;; :onclick "playerctl loop ${pside.loop == 'Track' ? 'Playlist' : 'Track'}" + ;; (label + ;; :text {pside.loop == "Track" ? "󰑘" : "󰑖"})) ;; ) - )))) + )))) -(defwindow sidectl4 +(defwindow sidectl4 :geometry (geometry - :x 0 - :y 0 - :width 340 - :height 0 - :anchor "bottom left" - ) + :x 0 + :y 0 + :width 340 + :height 0 + :anchor "bottom left" + ) :stacking "overlay" :monitor 0 (revealer :reveal revealcontrolpanel :transition "slideup" - (box + (box :class "popup" (control_widget :short true)))) - + (defwidget touchpad [] - (box + (box :class "unbarwidget" :orientation "h" - :width 180 - (box + :width 180 + (box :orientation "h" - (box + (box :orientation "v" - (button :onclick "swaymsg floating toggle" + (button :onclick "swaymsg floating toggle" (label :class "largetouchicon" :text "󱟱")) - (button :onclick "foot -D ~" + (button :onclick "foot -D ~" (label :class "largetouchicon" :text "")) - (button :onclick "./scripts/pop scrop" + (button :onclick "./scripts/pop scrop" (label :class "largetouchicon" :text "󰆞")) ) - (box - :orientation "v" - (button :onclick "swaymsg kill" - (label :class "largetouchicon" :text "󰅙")) - (button :onclick "${EWW_CMD} update revealcontrolpanel=false && (cd && wofi --show=drun -i -I)" - (label :class "largetouchicon" :text "󰀻")) - (button :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false" - (label :class "largetouchicon" :text "󰌌")) + (box + :orientation "v" + (button :onclick "swaymsg kill" + (label :class "largetouchicon" :text "󰅙")) + (button :onclick "${EWW_CMD} update revealcontrolpanel=false && (cd && wofi --show=drun -i -I)" + (label :class "largetouchicon" :text "󰀻")) + (button :onclick "./scripts/touchkey.sh && ${EWW_CMD} update revealcontrolpanel=false" + (label :class "largetouchicon" :text "󰌌")) )))) diff --git a/hypr-configs/hyprland/eww/bottom_bar/bar.scss b/hypr-configs/hyprland/eww/src/bottom-bar/styles.scss similarity index 100% rename from hypr-configs/hyprland/eww/bottom_bar/bar.scss rename to hypr-configs/hyprland/eww/src/bottom-bar/styles.scss diff --git a/hypr-configs/hyprland/eww/control_panel/control_panel.yuck b/hypr-configs/hyprland/eww/src/control-panel/main.yuck similarity index 97% rename from hypr-configs/hyprland/eww/control_panel/control_panel.yuck rename to hypr-configs/hyprland/eww/src/control-panel/main.yuck index 9978e83..98d5cfe 100644 --- a/hypr-configs/hyprland/eww/control_panel/control_panel.yuck +++ b/hypr-configs/hyprland/eww/src/control-panel/main.yuck @@ -1,3 +1,5 @@ +(include "./src/control-panel/windowswitcher.yuck") + (defwindow control_panel :geometry (geometry :x 10 @@ -217,7 +219,7 @@ :valign "start" :halign "fill" :hexpand true - (image :style "margin: 10px;" :image-width 80 :image-height 80 :path "./image/fieshidle.gif") + (image :style "margin: 10px;" :image-width 80 :image-height 80 :path "./assets/image/fieshidle.gif") (scroll :hscroll true :vscroll false @@ -304,7 +306,7 @@ (image :image-width 50 :image-height 50 - :path "./image/weather/${hour.icon}.svg") + :path "./assets/image/weather/${hour.icon}.svg") (box :orientation "v" :space-evenly false @@ -325,7 +327,7 @@ :image-width 100 :image-height 100 :style "margin: 10px;" - :path "./image/weather/${weatherjson.icon}.svg") + :path "./assets/image/weather/${weatherjson.icon}.svg") (scroll :hscroll true :vscroll false @@ -474,7 +476,7 @@ :halign "center" :valign "center" :spacing 10 - (image :image-width 100 :image-height 100 :path { pcover == "" ? "./image/emptympd.png" : pcover }) + (image :image-width 100 :image-height 100 :path { pcover == "" ? "./assets/image/emptympd.png" : pcover }) (box :orientation "v" :space-evenly false @@ -498,6 +500,4 @@ (button :style "padding-right: 3px;" :onclick "playerctl play-pause" (label :text { pstatus == "Playing" ? "" : ""} )) (button :onclick "playerctl next" - (label :text "󰒭"))))))) - -(include "./control_panel/windowswitcher.yuck") + (label :text "󰒭"))))))) \ No newline at end of file diff --git a/hypr-configs/hyprland/eww/control_panel/control_panel.scss b/hypr-configs/hyprland/eww/src/control-panel/styles.scss similarity index 100% rename from hypr-configs/hyprland/eww/control_panel/control_panel.scss rename to hypr-configs/hyprland/eww/src/control-panel/styles.scss diff --git a/hypr-configs/hyprland/eww/control_panel/windowswitcher.yuck b/hypr-configs/hyprland/eww/src/control-panel/windowswitcher.yuck similarity index 72% rename from hypr-configs/hyprland/eww/control_panel/windowswitcher.yuck rename to hypr-configs/hyprland/eww/src/control-panel/windowswitcher.yuck index 9449efd..bb5984f 100644 --- a/hypr-configs/hyprland/eww/control_panel/windowswitcher.yuck +++ b/hypr-configs/hyprland/eww/src/control-panel/windowswitcher.yuck @@ -1,9 +1,9 @@ ;; Credits to T0kyob0y -(defwidget overview[] - (box - :space-evenly false +(defwidget overview [] + (box + :space-evenly false :class "unbarwidget" :orientation "h" :hexpand true @@ -11,7 +11,7 @@ :hscroll true :vscroll false :hexpand true - (box + (box :orientation "h" :space-evenly true :spacing 10 @@ -20,26 +20,26 @@ ;; :ondropped "notify-send 'real'" :onclick "${EWW_CMD} update revealcontrolpanel=false && swaymsg -t command workspace number ${i+1}" ;; :onclick "swaymsg -t command workspace number ${i+1}" - (box + (box :class "overviewworkspace" - :space-evenly false + :space-evenly false ;; :height {round(1080/5.8, 0)} :vexpand true :width {round(1920/5.8, 0)} (for j in {windows[i]} (windowapp :w j) - )) - )))))) + )) + )))))) (defwidget windowapp [w] - (box + (box :style " - margin-left: ${round(((w.rect.x)/5.8), 0)}px; - margin-top: ${round(w.rect.y/5.8, 0)}px; - margin-right: -${round((w.rect.x + w.rect.width)/5.8, 0)}px; - margin-bottom: -${round(((w.rect.y + w.rect.height)/5.8), 0)}px; + margin-left: ${round(((w.rect.x)/5.8), 0)}px; + margin-top: ${round(w.rect.y/5.8, 0)}px; + margin-right: -${round((w.rect.x + w.rect.width)/5.8, 0)}px; + margin-bottom: -${round(((w.rect.y + w.rect.height)/5.8), 0)}px; " - :hexpand false + :hexpand false :vexpand false :halign "start" :valign "start" @@ -49,10 +49,10 @@ :halign "center" :dragvalue "${w.pid}" :dragtype "text" - (image + (image :valign "center" :halign "center" :image-height {round(w.rect.width/5.8 * 45/100, 0)} :image-width {round(w.rect.height/5.8 * 45/100, 0)} :path {w.path} - )))) + )))) diff --git a/hypr-configs/hyprland/eww/dashboard/dashboard.yuck b/hypr-configs/hyprland/eww/src/dashboard/main.yuck similarity index 97% rename from hypr-configs/hyprland/eww/dashboard/dashboard.yuck rename to hypr-configs/hyprland/eww/src/dashboard/main.yuck index bb83806..21b1c62 100644 --- a/hypr-configs/hyprland/eww/dashboard/dashboard.yuck +++ b/hypr-configs/hyprland/eww/src/dashboard/main.yuck @@ -1,5 +1,4 @@ -;; Dashboard design is made by tsukki9696 (defwindow dashboard :geometry (geometry :x 0 @@ -16,7 +15,7 @@ :class "popup" :space-evenly false :orientation "v" - (duser :name "Failed" :tag "failed.sh" :pfp "./image/roundpfp.png") + (duser :name "Failed" :tag "failed.sh" :pfp "./assets/image/roundpfp.png") (box :space-evenly true :orientation "h" diff --git a/hypr-configs/hyprland/eww/src/dashboard/styles.scss b/hypr-configs/hyprland/eww/src/dashboard/styles.scss new file mode 100644 index 0000000..c1bca56 --- /dev/null +++ b/hypr-configs/hyprland/eww/src/dashboard/styles.scss @@ -0,0 +1,19 @@ +.heading { + font-size: 25px; + color: $accent; + margin: 5px; +} + +.dmpdcontrol { + margin: 10px; +} + +.dmpdcontrol label { + font-size: 20px; + margin: 0px 8px; +} + +.dicons label { + font-size: 25px; + margin-right: 6px; +} diff --git a/hypr-configs/hyprland/eww/desktop/desktop.yuck b/hypr-configs/hyprland/eww/src/desktop/main.yuck similarity index 90% rename from hypr-configs/hyprland/eww/desktop/desktop.yuck rename to hypr-configs/hyprland/eww/src/desktop/main.yuck index 58bb0a4..1513dd6 100644 --- a/hypr-configs/hyprland/eww/desktop/desktop.yuck +++ b/hypr-configs/hyprland/eww/src/desktop/main.yuck @@ -30,12 +30,12 @@ (defwidget imagesicon [name] (eventbox - :onclick "feh ./image/desktop/${name}.png" + :onclick "feh ./assets/image/desktop/${name}.png" :class "desktopbox" (box :orientation "v" :space-evenly false :height 100 :valign "end" - (image :width 100 :height 100 :image-width 80 :image-height 80 :path "./image/desktop/${name}.png") + (image :width 100 :height 100 :image-width 80 :image-height 80 :path "./assets/image/desktop/${name}.png") (label :class "desktoptext" :text "${name}.png")))) diff --git a/hypr-configs/hyprland/eww/desktop/desktop.scss b/hypr-configs/hyprland/eww/src/desktop/styles.scss similarity index 100% rename from hypr-configs/hyprland/eww/desktop/desktop.scss rename to hypr-configs/hyprland/eww/src/desktop/styles.scss diff --git a/hypr-configs/hyprland/eww/dock/dock.yuck b/hypr-configs/hyprland/eww/src/dock/main.yuck similarity index 100% rename from hypr-configs/hyprland/eww/dock/dock.yuck rename to hypr-configs/hyprland/eww/src/dock/main.yuck diff --git a/hypr-configs/hyprland/eww/dock/dock.scss b/hypr-configs/hyprland/eww/src/dock/styles.scss similarity index 100% rename from hypr-configs/hyprland/eww/dock/dock.scss rename to hypr-configs/hyprland/eww/src/dock/styles.scss diff --git a/hypr-configs/hyprland/eww/src/bar/main.yuck b/hypr-configs/hyprland/eww/src/sidebar/main.yuck similarity index 93% rename from hypr-configs/hyprland/eww/src/bar/main.yuck rename to hypr-configs/hyprland/eww/src/sidebar/main.yuck index 0c739dc..d1abddb 100644 --- a/hypr-configs/hyprland/eww/src/bar/main.yuck +++ b/hypr-configs/hyprland/eww/src/sidebar/main.yuck @@ -19,7 +19,7 @@ :space-evenly false (revealer :transition "slideright" - :reveal revealcontrolpanel + :reveal revealControlpanel (control_widget)) (centerbox :class "barwidget" @@ -69,23 +69,17 @@ ; (battery) )) -(defvar show_no_of_windows false) - -(deflisten workspacesdata :initial "[]" "./scripts/workspaces get-all-workspaces") - -(defpoll current_workspace :initial "0" :interval "50ms" "./scripts/workspaces get-active-workspace") - (defwidget workspaces [] (eventbox :cursor "pointer" :onscroll "./scripts/workspaces change {} ${current_workspace}" - :onhover "eww update show_no_of_windows=true" - :onhoverlost "eww update show_no_of_windows=false" + :onhover "${EWW_CMD} update show_no_of_windows=true" + :onhoverlost "${EWW_CMD} update show_no_of_windows=false" (box :class "workspaces" :space-evenly false :orientation "v" - (for workspace in {workspacesdata} + (for workspace in {workspacesjson} (button :onclick "hyprctl dispatch workspace ${workspace.id}" (box @@ -109,7 +103,7 @@ ;; :onclick "~/.config/eww/meowidgets/scripts/launch" ;; :onclick "~/.config/eww/meowayland/scripts/launch" ;; :onclick "./scripts/pop control" - :onclick "${EWW_CMD} update revealcontrolpanel=${ !revealcontrolpanel }" + :onclick "${EWW_CMD} update revealControlpanel=${ !revealControlpanel }" :onrightclick "${EWW_CMD} open wallpaperselect --toggle" :cursor "pointer" (label :text "" :halign "center" :class "launchicon" :style "padding: 2px 0px;")))) @@ -205,7 +199,7 @@ :spacing 5 (eventbox :onclick "${EWW_CMD} open music --toggle" - (image :path { pcover == "" ? "./image/emptympd.png" : pcover } :image-width 20 :image-height 20)) + (image :path { pcover == "" ? "./assets/image/emptympd.png" : pcover } :image-width 20 :image-height 20)) (button :onclick "playerctl previous" (label :class "picon" :text "󰒮")) (button :onclick "playerctl play-pause" @@ -313,7 +307,7 @@ :class "unbarwidget" :space-evenly false :spacing 20 - (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./image/emptympd.png" : pcover }) + (image :style "margin: 5px;" :image-height 190 :image-width 190 :path { pcover == "" ? "./assets/image/emptympd.png" : pcover }) (box :orientation "v" :space-evenly false diff --git a/hypr-configs/hyprland/eww/src/bar/styles.scss b/hypr-configs/hyprland/eww/src/sidebar/styles.scss similarity index 100% rename from hypr-configs/hyprland/eww/src/bar/styles.scss rename to hypr-configs/hyprland/eww/src/sidebar/styles.scss diff --git a/hypr-configs/hyprland/eww/wallpapers/wallpapers.yuck b/hypr-configs/hyprland/eww/src/wallpapers/main.yuck similarity index 96% rename from hypr-configs/hyprland/eww/wallpapers/wallpapers.yuck rename to hypr-configs/hyprland/eww/src/wallpapers/main.yuck index 5ccd50a..79960a3 100644 --- a/hypr-configs/hyprland/eww/wallpapers/wallpapers.yuck +++ b/hypr-configs/hyprland/eww/src/wallpapers/main.yuck @@ -8,7 +8,6 @@ :anchor "center") :stacking "overlay" :monitor 0 - :focusable true (box :class "popup" (wallpaperselectwidget))) @@ -46,7 +45,7 @@ :style "margin: 50px 0px 5px 0px;" :hexpand false :vexpand false - :path "./image/fieshidle.gif" + :path "./assets/image/fieshidle.gif" :visible {arraylength(wallpapers) == 0}) (label