Skip to content

Commit

Permalink
Merge pull request #152 from Horki/151-qhd-request
Browse files Browse the repository at this point in the history 
151: QHD support request; init
  • Loading branch information
@Axarva
Axarva authored Aug 28, 2022
2 parents 0dcc719 + ee0bcf9 commit 1f3b36b
Show file tree
Hide file tree
Showing 8 changed files with 794 additions and 3 deletions.
484 changes: 484 additions & 0 deletions config/eww-2560/eww.scss
View file

Large diffs are not rendered by default.

297 changes: 297 additions & 0 deletions config/eww-2560/eww.yuck
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,297 @@
(defwidget player []
(box :orientation "v" :space-evenly "false"
(box :class "musicart" :style "background-image: url('${cover}');" {art})
(box :class "musictitle" "${music3}${title}")
(box :class "musicartist" "${music2}${artist}")
(box :orientation "h" :halign "center" :class "musicbtn" :space-evenly "false"
(button :onclick "playerctl previous" "")
(button :onclick "playerctl play-pause" {musicstat})
(button :onclick "playerctl next" ""))
(box :orientation "h" :class "music-slider" :space-evenly "false" :halign "center"
(scale :min 0 :max 101 :value {musicpos} :active "false"))))
(defwidget smol_calendar []
(box :orientation "v" :space-evenly "false"
(box :class "number_day" {number_day})
(box :class "month" {month})))
(defwidget weather_side []
(box :orientation "h" :space-evenly "false"
(box :class "weather-icon-side" :style "color: ${weather-hex}" {weather-icon})
(box :class "weather-info-side" :orientation "v" :space-evenly "false"
(box :class "temperature-side" "${temperature} ")
(box :class "weather-stat-side" {weather-stat-side}))))
(defwidget player_side []
(box :orientation "h" :space-evenly "false"
(box :class "musicart-side" :style "background-image: url('${cover}');" {art})
(box :class "musicstuff-side" :orientation "v" :space-evenly "false"
(box :class "musicinfo-side" "${music3}${title}")
(box :orientation "h" :halign "center" :class "musicbtn-side" :space-evenly "false"
(button :onclick "playerctl previous" "")
(button :class "pause-play-side" :onclick "playerctl play-pause" {musicstat})
(button :onclick "playerctl next" "")))))
(defwidget time_side []
(box :orientation "v" :space-evenly "false"
(box :orientation "h" :class "time-side" :space-evenly "true"
(box :class "hour-side" {hour})
(box :class "minute-side" {min}))
(box :class "day-side" {day})))
(defwidget sliders_side []
(box :orientation "v" :space-evenly "false" :class "sliders-side"
(box :orientation "h" :class "slider-vol-side" :space-evenly "false"
(box :class "label-vol-side" "")
(scale :min 0 :max 101 :value {volume} :onchange "amixer -D pulse sset Master {}%"))
(box :orientation "h" :class "slider-bright-side" :space-evenly "false"
(box :class "label-bright-side" "")
(scale :min 0 :max 101 :value {bright} :onchange "brightnessctl s {}%"))
(box :orientation "h" :class "slider-ram-side" :space-evenly "false"
(box :class "label-ram-side" "")
(scale :min 0 :active "false" :max 101 :value {ram-used}))
(box :orientation "h" :class "slider-battery-side" :space-evenly "false"
(box :class "label-battery-side" {bat-icon})
(scale :min 0 :active "false" :max 101 :value {battery-remaining}))))
(defwidget sys_side []
(box :orientation "v" :space-evenly "false"
(button :class "search-side" :onclick "~/bin/launcher.sh" " Search...")
(box :orientation "h" :halign "center" :class "sysbtn" :space-evenly "true"
(button :class "shutdown-side" :onclick "~/.config/eww/scripts/shutdown.sh" :timeout "60s" "")
(button :class "reboot-side" :onclick "~/.config/eww/scripts/reboot.sh" :timeout "60s" "")
(button :class "lock-side" :onclick "~/.config/eww/scripts/lockscreen.sh" :timeout "60s" "")
(button :class "suspend-side" :onclick "~/.config/eww/scripts/suspend.sh" :timeout "60s" "")
(button :class "logout-side" :onclick "~/.config/eww/scripts/logout.sh" :timeout "60s" ""))))
(defwidget calendar_full []
(box :orientation "v" :halign "center" :space-evenly "false"
(box :class "calendar_title" " ${day}, ${number_day} ${month_full} ${year_full}")
(box :class "calendar"
(calendar :show-details "true")
)))
(defwidget search_full []
(box :orientation "h" :space-evenly "true"
(button :class "search-full" :onclick "~/bin/launcher.sh" "")))
(defwidget power_full []
(box :orientation "h" :space-evenly "true"
(button :class "power-full" :onclick "~/.config/eww/scripts/shutdown.sh" :timeout "60s" "")))
(defwidget reboot_full []
(box :orientation "h" :space-evenly "true"
(button :class "reboot-full" :onclick "~/.config/eww/scripts/reboot.sh" :timeout "60s" "")))
(defwidget lock_full []
(box :orientation "h" :space-evenly "true"
(button :class "lock-full" :onclick "~/.config/eww/scripts/lockscreen.sh" :timeout "60s" "")))
(defwidget suspend_full []
(box :orientation "h" :space-evenly "true"
(button :class "suspend-full" :onclick "~/.config/eww/scripts/suspend.sh" :timeout "60s" "")))
(defwidget logout_full []
(box :orientation "h" :space-evenly "true"
(button :class "logout-full" :onclick "~/.config/eww/scripts/logout.sh" :timeout "60s" "")))
(defwidget close_full []
(box :orientation "h" :space-evenly "true"
(button :class "power-full" :onclick "~/bin/centerkill" "")))
(defwidget profile []
(box :orientation "v" :space-evenly "false" :class "profile"
(box :orientation "h" :space-evenly "false"
(box :class "pfp"))
(box :orientation "v" :space-evenly "false"
(box :class "pfptxt" :valign "center" {whoami})
(box :class "subpfptxt" :halign "center" "Configs go brr"))))
(defwidget weather []
(box :orientation "v" :space-evenly "false"
(box :orientation "h" :space-evenly "false"
(box :class "weather-icon" :style "color: ${weather-hex}" {weather-icon})
(box :class "temperature" "${temperature} "))
(box :orientation "v" :space-evenly "false"
(box :class "weather-stat" {weather-stat})
(box :class "weather-quote-head" {weather-quote})
(box :class "weather-quote-tail" {weather-quote2}))))
(defwidget home_dir []
(box :orientation "v" :space-evenly "true" :class "home-dir"
(button :class "l1" :onclick "(thunar ~/${l1})" {l1-processed})
(button :class "l2" :onclick "(thunar ~/${l2})" {l2-processed})
(button :class "l3" :onclick "(thunar ~/${l3})" {l3-processed})
(button :class "l4" :onclick "(thunar ~/${l4})" {l4-processed})
(button :class "l5" :onclick "(thunar ~/${l5})" {l5-processed})
(button :class "l6" :onclick "(thunar ~/${l6})" {l6-processed})))
(defwidget quote []
(box :orientation "v" :space-evenly "false" :class "quote-box"
(label :class "quote-main" :halign "start" :text "${quote}${quote-gen}" :wrap "true" :width 25)
(label :class "quote-tail" :halign "start" :text {quote-tail} :wrap "true" :width 25)
(label :class "quote-author" :text "- ${author-quote}" :halign "end")))
(defwidget screenshot []
(box :orientation "v" :space-evenly "true"
(button :class "screenshot-icon" :onclick "msclip -c" :timeout "60s" "")))
(defwidget vpn []
(box :orientation "v" :space-evenly "true"
(button :class "vpn-icon" :onclick "~/.config/eww/scripts/vpntoggle" :style "color: ${vpn-hex}" "嬨${getvpnstat}")))
(defwidget donotdisturb []
(box :orientation "v" :space-evenly "true" :halign "center"
(button :class "disturb-icon" :onclick "~/bin/do_not_disturb.sh" :style "color: ${disturb-hex}" "⏾")))
(defwidget blur_full []
(box :orientation "v" :space-evenly "true"))
;; (defwidget powermenu []
;; (box :orientation "h" :halign "center" :class "sysbtn" :space-evenly "true"
;; (button :class "shutdown-side" :onclick "~/.config/eww/scripts/shutdown.sh" :timeout 600 "")
;; (button :class "reboot-side" :onclick "~/.config/eww/scripts/reboot.sh" :timeout 600 "")
;; (button :class "lock-side" :onclick "~/.config/eww/scripts/lockscreen.sh" :timeout 600 "")
;; (button :class "suspend-side" :onclick "~/.config/eww/scripts/suspend.sh" :timeout 600 "")
;; (button :class "logout-side" :onclick "~/.config/eww/scripts/logout.sh" :timeout 600 "")
;; (button :class "lock-side" :onclick "exec ~/bin/eww close powermenu" "")
;;)
;;)




;; Music vars
(defpoll music :interval "5s" "playerctl metadata --format '{{ artist }} - {{ title }}'")
(defpoll music2 :interval "10h" "~/.config/eww/scripts/getartist")
(defpoll music3 :interval "10h" "~/.config/eww/scripts/gettitle")
(defpoll art :interval "10h" "~/.config/eww/scripts/getart")
(defpoll volume :interval "16ms" "~/.config/eww/scripts/getvol")
(defpoll bright :interval "16ms" "~/.config/eww/scripts/getbri")
(defpoll musicstat :interval "1s" "~/bin/spotifystatus")
(defpoll cover :interval "2s" "~/.config/eww/scripts/echoart")
(defpoll title :interval "1s" "~/.config/eww/scripts/echotitle")
(defpoll artist :interval "1s" "cat /tmp/xmonad/spotify/artist")
(defpoll musicpos :interval "16ms" "~/.config/eww/scripts/getposition")
;; Date vars
(defpoll number_day :interval "5h" "date \"+%d\"")
(defpoll month :interval "10h" "date \"+%b\"")
(defpoll min :interval "10s" "date \"+%M\"")
(defpoll hour :interval "10s" "date \"+%H\"")
(defpoll day :interval "15h" "~/.config/eww/scripts/getday")
(defpoll month_full :interval "15h" "date \"+%B\"")
(defpoll year_full :interval "15h" "date \"+%Y\"")

;; Weather vars
(defpoll weather-icon :interval "20m" "cat /tmp/xmonad/weather/weather-icon")
(defpoll temperature :interval "20m" "cat /tmp/xmonad/weather/weather-degree")
(defpoll weather-hex :interval "20m" "cat /tmp/xmonad/weather/weather-hex")
(defpoll weather-quote :interval "20m" "~/.config/eww/scripts/getwethquote")
(defpoll weather-quote2 :interval "20m" "~/.config/eww/scripts/getwethquote2")
(defpoll weather-stat :interval "20m" "cat /tmp/xmonad/weather/weather-stat")
(defpoll weather-stat-side :interval "20m" "~/.config/eww/scripts/weather-trimmer")

;; Do not disturb var
(defpoll disturb-hex :interval "1s" "cat /tmp/xmonad/donotdisturb/color")
;; Your Name (not the anime movie, sadly)
(defpoll whoami :interval "50h" "whoami")

;; Big brain RAM vars
(defpoll ram-used :interval "1s" "~/.config/eww/scripts/getram")

;; Battery charge vars
(defpoll battery-remaining :interval "5s" "cat /sys/class/power_supply/BAT0/capacity")
(defpoll bat-icon :interval "5s" "~/.config/tint2/scripts/battery.sh")

;; Home-dir stuff
(defpoll l1-processed :interval "20h" "~/.config/eww/scripts/home-dir/l1-processed")
(defpoll l2-processed :interval "20h" "~/.config/eww/scripts/home-dir/l2-processed")
(defpoll l3-processed :interval "20h" "~/.config/eww/scripts/home-dir/l3-processed")
(defpoll l4-processed :interval "20h" "~/.config/eww/scripts/home-dir/l4-processed")
(defpoll l5-processed :interval "20h" "~/.config/eww/scripts/home-dir/l5-processed")
(defpoll l6-processed :interval "20h" "~/.config/eww/scripts/home-dir/l6-processed")
(defpoll l1 :interval "20h" "~/.config/eww/scripts/home-dir/l1")
(defpoll l2 :interval "20h" "~/.config/eww/scripts/home-dir/l2")
(defpoll l3 :interval "20h" "~/.config/eww/scripts/home-dir/l3")
(defpoll l4 :interval "20h" "~/.config/eww/scripts/home-dir/l4")
(defpoll l5 :interval "20h" "~/.config/eww/scripts/home-dir/l5")
(defpoll l6 :interval "20h" "~/.config/eww/scripts/home-dir/l6")


;; Quote vars
(defpoll author-quote :interval "10m" "cat /tmp/xmonad/quotes/author")
(defpoll quote :interval "10m" "cat /tmp/xmonad/quotes/quote")
(defpoll quote-gen :interval "30m" "~/.config/eww/scripts/quotes")
(defpoll quote-tail :interval "10m" "cat /tmp/xmonad/quotes/quote-tail")

;; Vpn stats
(defpoll getvpnstat :interval "10s" "~/.config/eww/scripts/getvpnstat")
(defpoll vpn-hex :interval "1s" "cat /tmp/xmonad/vpnstat-hex")




;; Sidebar stuff

(defwindow smol_calendar
:geometry (geometry :x "10px" :y "45px" :width "80px" :height "80px")
(smol_calendar))
(defwindow weather_side
:geometry (geometry :x "95px" :y "45px" :width "215px" :height "80px")
(weather_side))
(defwindow player_side
:geometry (geometry :x "10px" :y "270px" :width "300px" :height "122px")
(player_side))
(defwindow time_side
:geometry (geometry :x "10px" :y "130px" :width "300px" :height "135px")
(time_side))
(defwindow sliders_side
:geometry (geometry :x "10px" :y "397px" :width "300px" :height "205px")
(sliders_side))
(defwindow sys_side
:geometry (geometry :x "10px" :y "607px" :width "300px" :height "153px")
(sys_side))

;; Main Stuff
;; (defwindow calendar_full
;; :geometry (geometry :x "505px" :y "100px" :width "690px" :height "100px")

;;
;;
;; (calendar_full)
;;
;;)
(defwindow search_full
:geometry (geometry :x 450 :y 1000 :width "150px" :height "150px")
(search_full))
(defwindow power_full
:geometry (geometry :x "1950px" :y "300px" :width "150px" :height "150px")
(power_full))
(defwindow reboot_full
:geometry (geometry :x "1950px" :y "420px" :width "150px" :height "151px")
(reboot_full))
(defwindow lock_full
:geometry (geometry :x "1950px" :y "482px" :width "150px" :height "151px")
(lock_full))
(defwindow suspend_full
:geometry (geometry :x "1950px" :y "614px" :width "150px" :height "152px")
(suspend_full))
(defwindow logout_full
:geometry (geometry :x "1950px" :y "748px" :width "150px" :height "152px")
(logout_full))
(defwindow close_full
:geometry (geometry :x "633px" :y "861px" :width "110px" :height "122px")
(close_full))
(defwindow player
:geometry (geometry :x "1056px" :y "308px" :width "300px" :height "400px")
(player))
(defwindow profile
:geometry (geometry :x "390px" :y "220px" :width "340px" :height "750px")
(profile))
(defwindow weather
:geometry (geometry :x "740px" :y "220px" :width "410px" :height "400px")
(weather))
(defwindow home_dir
:geometry (geometry :x "1600px" :y "420px" :width "360px" :height "750px")
(home_dir))
(defwindow quote
:geometry (geometry :x "520px" :y "750px" :width "630px" :height "150px")
(quote))
(defwindow screenshot
:geometry (geometry :x "1600px" :y "220px" :width "360px" :height "150px")
(screenshot))
(defwindow vpn-icon
:geometry (geometry :x "740px" :y "630px" :width "200px" :height "110px")
(vpn))
(defwindow disturb-icon
:geometry (geometry :x "950px" :y "630px" :width "200px" :height "110px")
(donotdisturb))
(defwindow blur_full
:geometry (geometry :x "0px" :y "0px" :width "100%" :height "100%")
(blur_full))

;; (defwindow powermenu :focusable "true"
;; :geometry (geometry :x "35%" :y "20%" :width "30%" :height "40%")
;;
;;
;;
;; (powermenu)
;;
;;)
Binary file added config/eww-2560/images/image.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added config/eww-2560/images/qhd-p.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions config/eww-2560/scripts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../eww-1920/scripts
5 changes: 4 additions & 1 deletion install-on-arch-arcris.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ mkdir -p ~/.config/
--no-collapse --cr-wrap --column-separator "|" --no-tags --ok-label '< Seleccionar >' --nocancel --menu "Selecciona una opción para GNOME \n\n" 10 60 19)

options=(1 "1366x768"
2 "1920x1080")
2 "1920x1080"
3 "2560x1440")

choices=$("${cmd[@]}" "${options[@]}" 2>&1 >/dev/tty)

Expand All @@ -64,6 +65,8 @@ mkdir -p ~/.config/
;;
2) EWW_DIR='config/eww-1920'
;;
3) EWW_DIR='config/eww-2560'
;;
esac
done
if [ -d ~/.config/eww ]; then
Expand Down
5 changes: 4 additions & 1 deletion install-on-arch.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ mkdir -p ~/.config/
mkdir ~/.config/rofi && cp -r ./config/rofi/* ~/.config/rofi;
fi
sleep 5
echo "1)1366 x 768 2)1920 x 1080"
echo "1)1366 x 768 2)1920 x 1080 3)2560 x 1440"
read -r -p "Choose your screen resolution: " res
case $res in
[1])
Expand All @@ -107,6 +107,9 @@ mkdir -p ~/.config/
[2])
EWW_DIR='config/eww-1920'
;;
[3])
EWW_DIR='config/eww-2560'
;;
[*])
EWW_DIR='config/eww-1366'
;;
Expand Down
5 changes: 4 additions & 1 deletion install-on-gentoo.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ case $conti in
mkdir ~/.config/rofi && cp -r ./config/rofi/* ~/.config/rofi;
fi
sleep 5
echo "1)1366 x 768 2)1920 x 1080"
echo "1)1366 x 768 2)1920 x 1080 3)2560 x 1440"
read -r -p "Choose your screen resolution: " res
case $res in
[1])
Expand All @@ -40,6 +40,9 @@ case $conti in
[2])
EWW_DIR='config/eww-1920'
;;
[3])
EWW_DIR='config/eww-2560'
;;
[*])
EWW_DIR='config/eww-1366'
;;
Expand Down

0 comments on commit 1f3b36b

Please sign in to comment.