diff --git a/eww/eww.scss b/eww/eww.scss index 2c6d162..669c8d2 100644 --- a/eww/eww.scss +++ b/eww/eww.scss @@ -32,27 +32,26 @@ tooltip label { /** Widgets **/ .clock_time_sep { - font-size: 16; + font-size: 20; color: #bfc9db; - margin: 0px 4px 1px 4px; + margin: 0px 0px 1px 0px; } .clock_time_class, .clock_minute_class { - font-size: 21; + font-size: 24; } .clock_date_class { - font-size: 18; - margin: 0px 20px 0px -1px; + font-size: 21; + margin: 0px 5px 0px 5px; color: #d7beda; } .clock_minute_class { - margin: 0px 20px 0px 3px; + margin: 0px 5px 0px 2px; color: #bfc9db; } - .clock_time_class { color: #bfc9db; font-weight: bold; - margin: 0px 3px 0px 0px; + margin: 0px 0px 0px 8px; } @@ -74,23 +73,31 @@ tooltip label { background-image: linear-gradient(to right, #afcee0 30%, #a1bdce 50%, #77a5bf 100% *50); border-radius: 10px; } + +.module_app_text { + font-size: 23; + margin: 2px 0px 0px 0px; +} +.bright_icon { + font-size: 22; + color: #e4c9af; + margin: 0px 10px 0px 0px; +} .volume_icon { font-size: 22; color: #a1bdce; - margin: 0px 10px 0px 10px; -} - - -.module_essid { - font-size: 18; - color: #a1bdce; - margin: 0px 10px 0px 0px; + margin: 0px 5px 0px 0px; } .module-wif { font-size: 22; color: #a1bdce; border-radius: 100%; - margin: 0px 10px 0px 5px; + margin: 0px 10px 0px 0px; +} +.module_essid { + font-size: 18; + color: #a1bdce; + margin: 0px 5px 0px -1px; } .iconmem { @@ -102,18 +109,13 @@ tooltip label { font-size: 23; color: #afbea2; } -.bright_icon { - font-size: 22; - color: #e4c9af; - margin: 0px 10px 0px 10px; -} .separ { color: #3e424f; font-weight: bold; font-size: 22px; - margin: 0px 8px 0px 8px; + margin: 0px 0px 0px 0px; } .mem_module { @@ -141,7 +143,7 @@ scale trough { .works { font-size: 27px; font-weight: normal; -margin: 5px 0px 0px 20px; +margin: 0px 0px 0px 15px; background-color: #0f0f17; } @@ -198,6 +200,7 @@ color: #3e424f; } // Calendar .cal { + border-radius: 10px; background-color: #0f0f17; font-family: JetBrainsMono Nerd Font; font-size: 18px; @@ -269,6 +272,7 @@ color: #bfc9db; margin: 30px; } .sys_win { + border-radius: 10px; background-color: #0f0f17; } .sys_bat { diff --git a/eww/eww.yuck b/eww/eww.yuck index a35109d..b9dc624 100644 --- a/eww/eww.yuck +++ b/eww/eww.yuck @@ -62,10 +62,7 @@ (revealer :transition "slideright" :reveal wifi_rev :duration "350ms" - (label :class "module_essid" - :text ESSID_WLAN - :orientation "h" - ))))) + (button :class "module_essid" :onclick "hyprctl dispatch exec 'alacritty -e nmtui'" :wrap "false" :limit-width 12 :style "color: ${COL_WLAN};" ESSID_WLAN))))) (defwidget bluetooth [] (box :vexpand "false" :hexpand "false" :space-evenly "false" @@ -111,17 +108,17 @@ (defwidget clock_module [] (eventbox :onhover "${eww} update time_rev=true" :onhoverlost "${eww} update time_rev=false" - (box :class "module" :space-evenly "false" :orientation "h" :spacing "3" - (label :text clock_time :class "clock_time_class" ) - (label :text "" :class "clock_time_sep" ) - (label :text clock_minute :class "clock_minute_class") - (revealer :transition "slideleft" - :reveal time_rev - :duration "350ms" - (button :class "clock_date_class" - :onclick "scripts/pop calendar" clock_date - ) - )))) + (button :onclick "scripts/pop calendar" + (box :class "module" :space-evenly "false" :orientation "h" :spacing "3" + (label :text clock_time :class "clock_time_class" ) + (label :text "" :class "clock_time_sep" ) + (label :text clock_minute :class "clock_minute_class") + (revealer :class "clock_date_class" + :transition "slideleft" + :reveal time_rev + :duration "350ms" + clock_date + ))))) ;; speaker and mic volume ;; (defwidget volume [] @@ -158,6 +155,8 @@ ;; audio volume widget ;; (defwidget audio [] + (eventbox :onhover "scripts/pop hoverCreate" + :onhoverlost "scripts/pop hoverGet audio_ctl" (box :class "audio-box" :orientation "v" :space-evenly "false" :vexpand "false" :hexpand "false" (box :halign "v" :space-evenly "false" :hexpand "false" :vexpand "false" (box :class "speaker_icon" :orientation "v") @@ -183,7 +182,7 @@ :tooltip "mic on ${mic_percent}%" :onchange "amixer -D pulse sset Capture {}%" :max 100 - :min 0)))))) + :min 0))))))) ;; Music ;; ;;(defwidget music [] @@ -205,11 +204,13 @@ ;; calendar ;; (defwidget cal [] + (eventbox :onhover "scripts/pop hoverCreate" + :onhoverlost "scripts/pop hoverGet calendar" (box :class "cal" :orientation "v" (box :class "cal-in" (calendar :class "cal" :day calendar_day - :year calendar_year)))) + :year calendar_year))))) ;; Music again.. ;; ;;(defwidget music_pop [] @@ -227,6 +228,8 @@ (defwidget system [] + (eventbox :onhover "scripts/pop hoverCreate" + :onhoverlost "scripts/pop hoverGet system" (box :class "sys_win" :orientation "v" :space-evenly "false" :hexpand "false" :vexpand "false" :spacing 0 (box :class "sys_bat_box" :orientation "h" :space-evenly "false" (circular-progress :value battery-capacity @@ -285,7 +288,7 @@ :class "sys_text_mem_sub" :limit-width 22 :show_truncated false - :wrap false))))) + :wrap false)))))) ;; left side but displayed right? ;; (defwidget left [] @@ -334,7 +337,7 @@ (defwindow calendar :monitor 0 :geometry (geometry :x "20px" - :y "2%" + :y "2px" :anchor "top right" :width "270px" :height "60px") @@ -344,7 +347,7 @@ (defwindow audio_ctl :monitor 0 :geometry (geometry :x "250px" - :y "2%" + :y "2px" :anchor "top right" :width "280px" :height "60px") @@ -359,7 +362,7 @@ (defwindow system :monitor 0 :geometry (geometry :x "50px" - :y "2%" + :y "2px" :anchor "top right" :width "290px" :height "120px") @@ -370,7 +373,7 @@ (defwindow bar :monitor 0 :geometry (geometry :x "0%" - :y "3px" + :y "1px" :width "99%" :height "20px" :anchor "top center") diff --git a/eww/scripts/current_name b/eww/scripts/current_name index d7cc992..e141151 100755 --- a/eww/scripts/current_name +++ b/eww/scripts/current_name @@ -1,7 +1,7 @@ #!/bin/sh currentName() { win=$(hyprctl activewindow | grep class | awk -F ':' '{print $2}' | tr -d ' ') - echo "(box :class \"module\" :space-evenly \"false\" :orientation \"h\" :spacing \"3\" (label :text \"$win\" :class \"clock_minute_class\"))" + echo "(box :class \"module_app_text\" :space-evenly \"false\" :orientation \"h\" :spacing \"3\" (label :text \"$win\"))" } currentName tail -f /tmp/hypr/$HYPRLAND_INSTANCE_SIGNATURE/hyprland.log | grep -E --line-buffered "focus to surface" | while read -r; do diff --git a/eww/scripts/pop b/eww/scripts/pop index 5c8fa11..415a6d7 100755 --- a/eww/scripts/pop +++ b/eww/scripts/pop @@ -1,5 +1,6 @@ #!/bin/sh + calendar() { LOCK_FILE="$HOME/.cache/eww-calendar.lock" EWW_BIN="$HOME/.local/bin/eww" @@ -80,13 +81,35 @@ else fi } +hoverGet() { +NAME="$1" +EWW_BIN="$HOME/.local/bin/eww" +STORE="$HOME/.cache/cache.txt" +if [[ -f "$STORE" ]]; then + rm "$STORE" + ${EWW_BIN} -c $HOME/.config/eww close "$NAME" +fi +} + +hoverCreate() { +STORE="$HOME/.cache/cache.txt" +if [[ ! -f "$STORE" ]]; then + touch "$STORE" +else + echo "failure!" +fi +} if [ "$1" = "calendar" ]; then -calendar + calendar elif [ "$1" = "system" ]; then -system + system #elif [ "$1" = "music" ]; then #music elif [ "$1" = "audio" ]; then -audio + audio +elif [ "$1" = "hoverGet" ]; then + hoverGet "$2" +elif [ "$1" = "hoverCreate" ]; then + hoverCreate fi diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf index 558dc0c..437eca7 100644 --- a/hypr/hyprland.conf +++ b/hypr/hyprland.conf @@ -1,15 +1,4 @@ -######################################################################################## -AUTOGENERATED HYPR CONFIG. -PLEASE USE THE CONFIG PROVIDED IN THE GIT REPO /examples/hypr.conf AND EDIT IT, -OR EDIT THIS ONE ACCORDING TO THE WIKI INSTRUCTIONS. -######################################################################################## - - -# -# Please note not all available settings / options are set here. -# For a full list, see the wiki (basic and advanced configuring) -# # #fix the fucking portal exec-once=systemctl --user import-environment @@ -21,7 +10,7 @@ autogenerated=0 # remove this line to get rid of the warning on top. monitor=,preferred,auto,1 input { - kb_file= + kb_file=/home/dashie/.config/keymap.xkb #us with dead_diaeresis on shift + ' to get ä ö ü kb_layout= kb_variant= kb_model= @@ -58,7 +47,7 @@ decoration { blur=1 blur_size=3 # minimum 1 blur_passes=1 # minimum 1 - blur_new_optimizations=1 + blur_new_optimizations=true } animations { @@ -70,6 +59,7 @@ animations { } dwindle { + preserve_split=true pseudotile=0 # enable pseudotiling on dwindle } @@ -77,13 +67,17 @@ gestures { workspace_swipe=yes } +misc { + animate_manual_resizes=true + } + #reserve place for bar #monitor=eDP-1,addreserved,45,0,0,0 # example window rules # for windows named/classed as abc and xyz +windowrule=tile,^(.*)(Spotify)(.*)$ windowrule=center,^(.*)$ -#windowrule=size 420 69,abc #windowrule=tile,xyz #windowrule=float,abc #windowrule=pseudo,abc @@ -98,13 +92,18 @@ bind=SUPER,M,exit, bind=SUPER,E,exec,nautilus --new-window bind=SUPER,V,togglefloating, bind=SUPER,R,exec,wofi --show drun -o DP-3 -bind=SUPER,P,exec,eww reload -bind=SUPER,B,exec,eww close-all +bind=SUPER,C,togglesplit +bind=SUPER,backslash,layoutmsg,cyclenext -bind=SUPER,left,movefocus,l -bind=SUPER,right,movefocus,r -bind=SUPER,up,movefocus,u -bind=SUPER,down,movefocus,d +bind=SUPER,bracketleft,movefocus,l +bind=SUPER,bracketright,movefocus,r +bind=SUPER,semicolon,movefocus,u +bind=SUPER,apostrophe,movefocus,d + +bind=SUPER,left,movewindow,l +bind=SUPER,right,movewindow,r +bind=SUPER,up,movewindow,u +bind=SUPER,down,movewindow,d bind=SUPER,1,workspace,1 bind=SUPER,2,workspace,2 @@ -131,8 +130,8 @@ bind=ALT,0,movetoworkspace,10 bind=SUPER,mouse_down,workspace,e+1 bind=SUPER,mouse_up,workspace,e-1 -bind=SUPER,I,resizeactive,-20 0 -bind=SUPER,O,resizeactive,20 0 +bind=SUPER,O,resizeactive,-20 0 +bind=SUPER,P,resizeactive,20 0 bind=SUPER,K,resizeactive,0 -20 bind=SUPER,L,resizeactive,0 20