diff --git a/de/home/.config/eww/modules/bar/battery.yuck b/de/home/.config/eww/modules/bar/battery.yuck index 70b52b2..b480ef2 100644 --- a/de/home/.config/eww/modules/bar/battery.yuck +++ b/de/home/.config/eww/modules/bar/battery.yuck @@ -12,12 +12,13 @@ (battery_children))) ; ${jq(EWW_BATTERY,'.[].capacity?')}%"} (defwidget battery_children [] - (box :class "reveal_children" + (box :class "reveal-children" :orientation "h" :space-evenly false :halign "center" - (progress - :height 10 - :valign "center" - :value {(EWW_BATTERY == "") ? 100 : jq(EWW_BATTERY,'.[].capacity?')} - :orientation "h"))) + (box + (progress + :height 10 + :valign "center" + :value {(EWW_BATTERY == "") ? 100 : jq(EWW_BATTERY,'.[].capacity?')} + :orientation "h")))) diff --git a/de/home/.config/eww/modules/bar/sysdisk.yuck b/de/home/.config/eww/modules/bar/sysdisk.yuck index fddf249..0ee2fe8 100644 --- a/de/home/.config/eww/modules/bar/sysdisk.yuck +++ b/de/home/.config/eww/modules/bar/sysdisk.yuck @@ -4,13 +4,15 @@ :class "${reveal_sysdisk} sysdisk" :revealvar reveal_sysdisk :revealvar-name "reveal_sysdisk" - (metric :label "󰟒 " - :tooltip "home" - :value {EWW_DISK["/home"].used_perc}) + (box + :class "revealer-preview" + (metric :label "󰟒 " + :tooltip "home" + :value {EWW_DISK["/home"].used_perc})) (sysdisk_children))) (defwidget sysdisk_children [] - (box :class "reveal_children" + (box :class "reveal-children" :orientation "h" :space-evenly false :halign "center" diff --git a/de/home/.config/eww/modules/bar/sysmem.yuck b/de/home/.config/eww/modules/bar/sysmem.yuck index 510ec6d..c306af2 100644 --- a/de/home/.config/eww/modules/bar/sysmem.yuck +++ b/de/home/.config/eww/modules/bar/sysmem.yuck @@ -4,13 +4,14 @@ :class "${reveal_sysmem} sysmem" :revealvar reveal_sysmem :revealvar-name "reveal_sysmem" - (metric :label " " - :class "revealer-preview" - :value {EWW_RAM.used_mem_perc}) + (box + :class "revealer-preview" + (metric :label " " + :value {EWW_RAM.used_mem_perc})) (sysmem_children))) (defwidget sysmem_children [] - (box :class "reveal_children" + (box :class "reveal-children" :orientation "h" :space-evenly false :halign "center" diff --git a/de/home/.config/eww/style/bar.scss b/de/home/.config/eww/style/bar.scss index 03d72f1..7342263 100644 --- a/de/home/.config/eww/style/bar.scss +++ b/de/home/.config/eww/style/bar.scss @@ -91,8 +91,9 @@ $transition-time: 0.3s; @import "./bar/networking.scss"; @import "./bar/bluetooth.scss"; @import "./bar/power.scss"; - @import "./bar/disk.scss"; - @import "./bar/memory.scss"; +// @import "./bar/disk.scss"; +// @import "./bar/memory.scss"; + @import "./bar/sys.scss"; @import "./bar/clock.scss"; .chevron box { diff --git a/de/home/.config/eww/style/bar/memory.scss b/de/home/.config/eww/style/bar/memory.scss index 6af6499..45f1587 100644 --- a/de/home/.config/eww/style/bar/memory.scss +++ b/de/home/.config/eww/style/bar/memory.scss @@ -1,5 +1,5 @@ .sysmem { - margin: 0px 10px; - $module-color: mix($color0,$color2); + margin: 0px 5px; + $module-color: mix($color0,$color2,25%); @import "./styles/revealer.scss" } diff --git a/de/home/.config/eww/style/bar/styles/revealer.scss b/de/home/.config/eww/style/bar/styles/revealer.scss index 2636e74..97e3237 100644 --- a/de/home/.config/eww/style/bar/styles/revealer.scss +++ b/de/home/.config/eww/style/bar/styles/revealer.scss @@ -4,7 +4,7 @@ } .revealer-preview, .reveal-children>* { - padding: 0px 5px; + padding: 0px 7px; min-width: $bar-module-width; transition: all 0.3s; } @@ -25,9 +25,3 @@ } } -//.revealer-on-hover>widget>box>box>* { -// -// padding: 0px 5px; -// -// transition: all 0.3s; -//} diff --git a/de/home/.config/eww/style/bar/sys.scss b/de/home/.config/eww/style/bar/sys.scss new file mode 100644 index 0000000..d3ef7a1 --- /dev/null +++ b/de/home/.config/eww/style/bar/sys.scss @@ -0,0 +1,15 @@ +.sysmem { + margin: 0px 5px; + $module-color: mix($color0,$color2,25%); + @import "./styles/revealer.scss" +} +.sysdisk { + margin: 0px 5px; + $module-color: mix($color0,$color7,45%); + @import "./styles/revealer.scss" +} +.battery { + margin: 0px 5px; + $module-color: mix($color0,$color2,25%); + @import "./styles/revealer.scss" +} diff --git a/default/home/.sapphrc/default b/default/home/.sapphrc/default index 93fb8e7..ad13569 100755 --- a/default/home/.sapphrc/default +++ b/default/home/.sapphrc/default @@ -142,9 +142,9 @@ if [[ "$HOSTNAME" == pod* ]];then cd ${POD_PATH} fi -#export PYENV_ROOT="$HOME/.pyenv" -#[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" -#eval "$(pyenv init - bash)" +export PYENV_ROOT="$HOME/.pyenv" +[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" +eval "$(pyenv init - bash)" export prompt_prefix=`awk '{$1=$1};1' <<< "${prompt_prefix}"` #PS1='\[\e[1m\e[95m\]${prompt_prefix}\[\e[m\]${debian_chroot:+($debian_chroot)}\[\e[01;32m\]\u@\h\[\e[00m\]:\[\e[01;34m\]\w\[\e[00m\]\n\$ '