diff --git a/eww/.config/eww/eww.scss b/eww/.config/eww/eww.scss index fa3e0cb..cd92669 100644 --- a/eww/.config/eww/eww.scss +++ b/eww/.config/eww/eww.scss @@ -4,28 +4,29 @@ padding-right: 300px; } -.0 , .01, .02, .03, .04, .05, .06, .07, .08, .09, -.011, .022, .033, .044, .055, .066, .077, .088, .099,{ +.W0 , .W01, .W02, .W03, .W04, .W05, .W06, .W07, .W08, .W09,.W011, .W022, .W033, .W044, .W055, .W066, .W077, .W088, .W099,{ margin: 0px 0px 0px 0px; } -/* Unoccupied */ -.0 { +// Unoccupied +.W0 { color: #606060; } -/* Occupied */ -.01, .02, .03, .04, .05, .06, .07, .08, .09 { +// Occupied +.W01, .W02, .W03, .W04, .W05, .W06, .W07, .W08, .W09 { color:#959595; font-weight: bold; } -/* Focused */ -.011, .022, .033, .044, .055, .066, .077, .088, .099{ +// Focused +.W011, .W022, .W033, .W044, .W055, .W066, .W077, .W088, .W099{ color: #ffffff; font-weight:bold; } + + .bar_right{ //padding left padding-left: 130px; diff --git a/eww/.config/eww/eww.yuck b/eww/.config/eww/eww.yuck index 352cdd1..617579b 100644 --- a/eww/.config/eww/eww.yuck +++ b/eww/.config/eww/eww.yuck @@ -36,7 +36,7 @@ :max-value 100 :min-value 0 :thickness 2 :size 20 "CPU") (circular-progress :class "mem" :value "${round(EWW_RAM.used_mem/EWW_RAM.total_mem*100,0)}" :max-value 100 :min-value 0 :thickness 2 :size 20 "RAM") - (button :class "time" :onclick "scripts/calendar calendar" + (button :class "time" :onclick "$HOME/.config/eww/scripts/calendar calendar" "${date.hour}:${date.min} ${date.am_pm}") (literal :class "idle" :content idle)))) @@ -48,6 +48,6 @@ :date "${date.year}-${date.month}-${date.day}" :format "%a %d %b")) -(deflisten workspace "scripts/workspace") +(deflisten workspace "$HOME/.config/eww/scripts/workspace") -(deflisten idle "scripts/idel") +(deflisten idle "$HOME/.config/eww/scripts/idel") diff --git a/eww/.config/eww/scripts/calendar b/eww/.config/eww/scripts/calendar index d6bf581..2f403a1 100755 --- a/eww/.config/eww/scripts/calendar +++ b/eww/.config/eww/scripts/calendar @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash calendar(){ LOCK_FILE="$HOME/.cache/eww-calendar.lock" diff --git a/eww/.config/eww/scripts/idel b/eww/.config/eww/scripts/idel index 5dbc670..b123905 100755 --- a/eww/.config/eww/scripts/idel +++ b/eww/.config/eww/scripts/idel @@ -1,14 +1,12 @@ -#! /bin/bash +#! /usr/bin/env bash #check if wayland-idle-inhibitor.py is running #loop forever -while true -do - if pgrep -x "way-inhibitor" > /dev/null - then - echo "(button :class \"idle_btn_on\" :onclick \"killall way-inhibitor\"\"\")" - else - echo "(button :class \"idle_btn_off\" :onclick \"way-inhibitor &\" \"\")" - fi - sleep 1 +while true; do + if pgrep -x "way-inhibitor" >/dev/null; then + echo "(button :class \"idle_btn_on\" :onclick \"killall way-inhibitor\"\"\")" + else + echo "(button :class \"idle_btn_off\" :onclick \"way-inhibitor &\" \"\")" + fi + sleep 1 done diff --git a/eww/.config/eww/scripts/workspace b/eww/.config/eww/scripts/workspace index 84681a3..0147534 100755 --- a/eww/.config/eww/scripts/workspace +++ b/eww/.config/eww/scripts/workspace @@ -1,48 +1,48 @@ -#! /bin/bash +#! /usr/bin/env bash #define icons for workspaces 1-9 ic=(0 一 二 三 四 五 六 七 八 九) #initial check for occupied workspaces for num in $(hyprctl workspaces | grep ID | sed 's/()/(1)/g' | awk 'NR>1{print $1}' RS='(' FS=')'); do - export o"$num"="$num" + export o"$num"="$num" done #initial check for focused workspace for num in $(hyprctl monitors | grep active | sed 's/()/(1)/g' | awk 'NR>1{print $1}' RS='(' FS=')'); do - export f"$num"="$num" - export fnum=f"$num" + export f"$num"="$num" + export fnum=f"$num" done workspaces() { -if [[ ${1:0:9} == "workspace" ]]; then #set focused workspace - unset -v "$fnum" - num=${1:11} - export f"$num"="$num" - export fnum=f"$num" + if [[ ${1:0:9} == "workspace" ]]; then #set focused workspace + unset -v "$fnum" + num=${1:11} + export f"$num"="$num" + export fnum=f"$num" -elif [[ ${1:0:15} == "createworkspace" ]]; then #set Occupied workspace - num=${1:17} - export o"$num"="$num" - export f"$num"="$num" + elif [[ ${1:0:15} == "createworkspace" ]]; then #set Occupied workspace + num=${1:17} + export o"$num"="$num" + export f"$num"="$num" -elif [[ ${1:0:16} == "destroyworkspace" ]]; then #unset unoccupied workspace - num=${1:18} - unset -v o"$num" f"$num" -fi + elif [[ ${1:0:16} == "destroyworkspace" ]]; then #unset unoccupied workspace + num=${1:18} + unset -v o"$num" f"$num" + fi -#output eww widget -echo "(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace\" \ + #output eww widget + echo "(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace\" \ (box :class \"works\" :orientation \"h\" :spacing 5 :space-evenly \"true\" \ - (button :onclick \"hyprctl dispatch workspace 1\" :onrightclick \"hyprctl dispatch workspace 1 && /home/taylor/.config/hypr/default_app\" :class \"0$o1$f1\" \"${ic[1]}\") \ - (button :onclick \"hyprctl dispatch workspace 2\" :onrightclick \"hyprctl dispatch workspace 2 && /home/taylor/.config/hypr/default_app\" :class \"0$o2$f2\" \"${ic[2]}\") \ - (button :onclick \"hyprctl dispatch workspace 3\" :onrightclick \"hyprctl dispatch workspace 3 && /home/taylor/.config/hypr/default_app\" :class \"0$o3$f3\" \"${ic[3]}\") \ - (button :onclick \"hyprctl dispatch workspace 4\" :onrightclick \"hyprctl dispatch workspace 4 && /home/taylor/.config/hypr/default_app\" :class \"0$o4$f4\" \"${ic[4]}\") \ - (button :onclick \"hyprctl dispatch workspace 5\" :onrightclick \"hyprctl dispatch workspace 5 && /home/taylor/.config/hypr/default_app\" :class \"0$o5$f5\" \"${ic[5]}\") \ - (button :onclick \"hyprctl dispatch workspace 6\" :onrightclick \"hyprctl dispatch workspace 6 && /home/taylor/.config/hypr/default_app\" :class \"0$o6$f6\" \"${ic[6]}\") \ - (button :onclick \"hyprctl dispatch workspace 7\" :onrightclick \"hyprctl dispatch workspace 7 && /home/taylor/.config/hypr/default_app\" :class \"0$o7$f7\" \"${ic[7]}\") \ - (button :onclick \"hyprctl dispatch workspace 8\" :onrightclick \"hyprctl dispatch workspace 8 && /home/taylor/.config/hypr/default_app\" :class \"0$o8$f8\" \"${ic[8]}\") \ - (button :onclick \"hyprctl dispatch workspace 9\" :onrightclick \"hyprctl dispatch workspace 9 && /home/taylor/.config/hypr/default_app\" :class \"0$o9$f9\" \"${ic[9]}\") \ + (button :onclick \"hyprctl dispatch workspace 1\" :onrightclick \"hyprctl dispatch workspace 1 && /home/taylor/.config/hypr/default_app\" :class \"W0$o1$f1\" \"${ic[1]}\") \ + (button :onclick \"hyprctl dispatch workspace 2\" :onrightclick \"hyprctl dispatch workspace 2 && /home/taylor/.config/hypr/default_app\" :class \"W0$o2$f2\" \"${ic[2]}\") \ + (button :onclick \"hyprctl dispatch workspace 3\" :onrightclick \"hyprctl dispatch workspace 3 && /home/taylor/.config/hypr/default_app\" :class \"W0$o3$f3\" \"${ic[3]}\") \ + (button :onclick \"hyprctl dispatch workspace 4\" :onrightclick \"hyprctl dispatch workspace 4 && /home/taylor/.config/hypr/default_app\" :class \"W0$o4$f4\" \"${ic[4]}\") \ + (button :onclick \"hyprctl dispatch workspace 5\" :onrightclick \"hyprctl dispatch workspace 5 && /home/taylor/.config/hypr/default_app\" :class \"W0$o5$f5\" \"${ic[5]}\") \ + (button :onclick \"hyprctl dispatch workspace 6\" :onrightclick \"hyprctl dispatch workspace 6 && /home/taylor/.config/hypr/default_app\" :class \"W0$o6$f6\" \"${ic[6]}\") \ + (button :onclick \"hyprctl dispatch workspace 7\" :onrightclick \"hyprctl dispatch workspace 7 && /home/taylor/.config/hypr/default_app\" :class \"W0$o7$f7\" \"${ic[7]}\") \ + (button :onclick \"hyprctl dispatch workspace 8\" :onrightclick \"hyprctl dispatch workspace 8 && /home/taylor/.config/hypr/default_app\" :class \"W0$o8$f8\" \"${ic[8]}\") \ + (button :onclick \"hyprctl dispatch workspace 9\" :onrightclick \"hyprctl dispatch workspace 9 && /home/taylor/.config/hypr/default_app\" :class \"W0$o9$f9\" \"${ic[9]}\") \ )\ )" } @@ -50,5 +50,5 @@ echo "(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xar workspaces socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | while read -r event; do -workspaces "$event" + workspaces "$event" done