From c7b3a600610bdededceeec788637501dd010ff80 Mon Sep 17 00:00:00 2001 From: Varris Date: Sun, 31 Dec 2023 01:51:43 +0100 Subject: [PATCH] update --- .../wayland/hyprland/eww/config/eww-bar.png | Bin 6286 -> 0 bytes .../wayland/hyprland/eww/config/eww.scss | 81 --------- .../wayland/hyprland/eww/config/eww.yuck | 157 ------------------ .../hyprland/eww/config/scripts/get_volume.sh | 16 -- .../eww/config/scripts/mpd_current_song.sh | 19 --- .../hyprland/eww/config/scripts/workspaces.sh | 47 ------ user/configs/wayland/hyprland/eww/default.nix | 11 -- 7 files changed, 331 deletions(-) delete mode 100644 user/configs/wayland/hyprland/eww/config/eww-bar.png delete mode 100644 user/configs/wayland/hyprland/eww/config/eww.scss delete mode 100644 user/configs/wayland/hyprland/eww/config/eww.yuck delete mode 100755 user/configs/wayland/hyprland/eww/config/scripts/get_volume.sh delete mode 100755 user/configs/wayland/hyprland/eww/config/scripts/mpd_current_song.sh delete mode 100755 user/configs/wayland/hyprland/eww/config/scripts/workspaces.sh delete mode 100644 user/configs/wayland/hyprland/eww/default.nix diff --git a/user/configs/wayland/hyprland/eww/config/eww-bar.png b/user/configs/wayland/hyprland/eww/config/eww-bar.png deleted file mode 100644 index e6de6a881bfe2907276306821e127cc785e046d6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6286 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 diff --git a/user/configs/wayland/hyprland/eww/config/eww.scss b/user/configs/wayland/hyprland/eww/config/eww.scss deleted file mode 100644 index a274d2a..0000000 --- a/user/configs/wayland/hyprland/eww/config/eww.scss +++ /dev/null @@ -1,81 +0,0 @@ -$bg: rgba(40,40,40,0.8); -$fg: rgb(235,219,178); - -$wsfg: rgb(235,219,178); -$wsbg: rgb(60,56,54); -$activewsbg: rgb(102,92,84); - - -$box-bg: rgb(80,73,69); - -* { - all: unset; //Unsets everything so you can style everything from scratch -} - -//Global Styles -.bar { - background-color: $bg; - color: $fg; - font-family: "JetBrainsMono Nerd Font"; - font-size: 12px; -} - -.window { - background-color: $box-bg; - border-radius: 10px; - padding: 0px 10px 0px 10px; - margin: 5px 0px 5px 10px; -} - -.volume { - background-color: $box-bg; - border-radius: 10px 0px 0px 10px; - margin: 5px 0px 5px 0px; - padding: 0px 10px 0px 10px; -} - -.mpd { - background-color: $box-bg; - border-radius: 0px 10px 10px 0px; - padding: 0px 10px 0px 10px; - margin: 5px 10px 5px 0px; -} - -.date { - background-color: $box-bg; - border-radius: 10px; - padding: 0px 10px 0px 10px; - margin: 5px 10px 5px 0px; -} - -.wswidget { - background-color: $box-bg; - border-radius: 10px; - margin: 5px 0px 5px 10px; -} - -.w0, .w01, .w02, .w03, .w04, .w05, .w06, .w07, .w08, .w09, .w011, .w022, .w033, .w044, .w055, .w066, .w077, .w088, .w099 { - background-color: $wsbg; - padding: 3px 10px; -} - -.w01, .w011, .w04, .w044 { - background-color: $wsbg; - border-radius: 10px 0px 0px 10px; -} - -.w03, .w033, .w06, .w066 { - background-color: $wsbg; - border-radius: 0px 10px 10px 0px; -} - -/* Occupied */ -.w01, .w02, .w03, .w04, .w05, .w06, .w07, .w08, .w09 { - background-color: $wsbg; -} - -/* Focused */ -.w011, .w022, .w033, .w044, .w055, .w066, .w077, .w088, .w099 { - background-color: $activewsbg; -} - diff --git a/user/configs/wayland/hyprland/eww/config/eww.yuck b/user/configs/wayland/hyprland/eww/config/eww.yuck deleted file mode 100644 index 036a2b8..0000000 --- a/user/configs/wayland/hyprland/eww/config/eww.yuck +++ /dev/null @@ -1,157 +0,0 @@ -;; ----------------------------- right monitor -(defwidget bar0 [] - (centerbox - :class "bar" - :orientation "h" - (left_side0) - (center) - (right_side) - ) -) - -(defwidget left_side0 [] - (box - :space-evenly false - :orientation "h" - :spacing 5 - - (box - :class "wswidget" - :spacing 0 - (workspaces0) - ) - - (box - :class "window" - window0) - ) -) - -;; ----------------------------- left monitor - -(defwidget bar1 [] - (centerbox - :class "bar" - :orientation "h" - (left_side1) - (center) - (right_side) - ) -) - -(defwidget left_side1 [] - (box - :space-evenly false - :orientation "h" - :spacing 5 - - (box - :class "wswidget" - :spacing 0 - (workspaces1) - ) - - (box - :class "window" - window1) - ) -) - -;; ----------------------------- - -(defwidget center [] - (box - :space-evenly false - :spacing 5 - - (eventbox - :onscroll "pamixer `echo {} | sed 's/up/\-i/\' | sed 's/down/\-d/'` 10" - (box - :space-evenly false - :class "volume" - volume)) - - (box - :space-evenly false - :class "mpd" - mpd) - ) -) - -(defwidget right_side [] - (box - :space-evenly false - :spacing 5 - :halign "end" - - (box - :space-evenly false - :orientation "h" - :class "date" - date) - ) -) - -;; ---------------------------- workspace widget - -(deflisten workspace0 - "scripts/workspaces.sh 0") - -(defwidget workspaces0 [] - (literal :content workspace0)) - -(deflisten workspace1 - "scripts/workspaces.sh 1") - -(defwidget workspaces1 [] - (literal :content workspace1)) - -;; ---------------------------- window widget - -(deflisten window0 "hyprland-activewindow `hyprctl monitors -j | jq -r \".[0].name\"`") -(deflisten window1 "hyprland-activewindow `hyprctl monitors -j | jq -r \".[1].name\"`") - -(defwidget title0 [] - (label :text "${window0}")) - -(defwidget title1 [] - (label :text "${window1}")) - -;; ----------------------------- - -(defpoll volume - :initial "" - :interval "0.1s" - "scripts/get_volume.sh") - -(deflisten mpd - :initial "" - "scripts/mpd_current_song.sh") - -(defpoll date - :interval "1s" - "date '+%a %d, %B %H:%M'") - -(defwindow bar0 - :monitor 0 - :windowtype "dock" - :geometry - (geometry :x "0%" - :y "0%" - :width "100%" - :height "32px" - :anchor "top center") - :exclusive true - (bar0)) - -(defwindow bar1 - :monitor 1 - :windowtype "dock" - :geometry - (geometry :x "0%" - :y "0%" - :width "100%" - :height "32px" - :anchor "top center") - :exclusive true - (bar1)) diff --git a/user/configs/wayland/hyprland/eww/config/scripts/get_volume.sh b/user/configs/wayland/hyprland/eww/config/scripts/get_volume.sh deleted file mode 100755 index e5b5810..0000000 --- a/user/configs/wayland/hyprland/eww/config/scripts/get_volume.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/usr/bin/env cached-nix-shell -#!nix-shell -i bash -p pamixer - -volume=$(pamixer --get-volume) - -if [[ $volume -eq 0 ]]; then - echo " $volume%" -elif [[ $volume -lt 25 ]]; then - echo " $volume%" -elif [[ $volume -lt 50 ]]; then - echo " $volume%" -elif [[ $volume -lt 75 ]]; then - echo "󰕾 $volume%" -else - echo " $volume%" -fi diff --git a/user/configs/wayland/hyprland/eww/config/scripts/mpd_current_song.sh b/user/configs/wayland/hyprland/eww/config/scripts/mpd_current_song.sh deleted file mode 100755 index c01defb..0000000 --- a/user/configs/wayland/hyprland/eww/config/scripts/mpd_current_song.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env cached-nix-shell -#!nix-shell -i bash -p mpc-cli - -currentsong="" -state="" - -while true; do - state=$(mpc status %state%) - current_song=$(mpc current) - - if [[ $state == "playing" ]]; then - echo " $current_song" - elif [[ $state == "paused" && $current_song ]]; then - echo "󰏤 $current_song" - else - echo " stopped" - fi - mpc idle player &> /dev/null -done diff --git a/user/configs/wayland/hyprland/eww/config/scripts/workspaces.sh b/user/configs/wayland/hyprland/eww/config/scripts/workspaces.sh deleted file mode 100755 index ee70734..0000000 --- a/user/configs/wayland/hyprland/eww/config/scripts/workspaces.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env cached-nix-shell -#!nix-shell -i bash -p hyprland socat jq - -workspaces() { - -unset -v \ -o1 o2 o3 o4 o5 o6 \ -f1 f2 f3 f4 f5 f6 - -# Get occupied workspaces and remove workspace -99 aka scratchpad if it exists -# a="$(hyprctl workspaces | grep ID | awk '{print $3}')" -# a="$(echo "${a//-99/}" | sed '/^[[:space:]]*$/d')" -ows="$(hyprctl workspaces -j | jq '.[] | del(select(.id == -99)) | .id')" - -for num in $ows; do - export o"$num"="$num" -done - -# Get Focused workspace for current monitor ID -arg="$1" -num="$(hyprctl monitors -j | jq --argjson arg "$arg" '.[] | select(.id == $arg).activeWorkspace.id')" -export f"$num"="$num" - -if [[ $arg -eq 0 ]]; then - echo "(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace\" \ - (box :class \"workspace\" :orientation \"h\" :space-evenly \"false\" \ - (button :onclick \"hyprctl dispatch workspace 1\" :class \"w0$o1$f1\" \"1\") \ - (button :onclick \"hyprctl dispatch workspace 2\" :class \"w0$o2$f2\" \"2\") \ - (button :onclick \"hyprctl dispatch workspace 3\" :class \"w0$o3$f3\" \"3\") \ - )\ - )" - elif [[ $arg -eq 1 ]]; then - echo "(eventbox :onscroll \"echo {} | sed -e 's/up/-1/g' -e 's/down/+1/g' | xargs hyprctl dispatch workspace\" \ - (box :class \"workspace\" :orientation \"h\" :space-evenly \"false\" \ - (button :onclick \"hyprctl dispatch workspace 4\" :class \"w0$o4$f4\" \"4\") \ - (button :onclick \"hyprctl dispatch workspace 5\" :class \"w0$o5$f5\" \"5\") \ - (button :onclick \"hyprctl dispatch workspace 6\" :class \"w0$o6$f6\" \"6\") \ - )\ - )" -fi -} - -workspaces $1 -socat -u UNIX-CONNECT:/tmp/hypr/"$HYPRLAND_INSTANCE_SIGNATURE"/.socket2.sock - | while read -r; do -workspaces $1 -done - diff --git a/user/configs/wayland/hyprland/eww/default.nix b/user/configs/wayland/hyprland/eww/default.nix deleted file mode 100644 index bfebc78..0000000 --- a/user/configs/wayland/hyprland/eww/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ - pkgs, - inputs, - ... -}: { - programs.eww = { - enable = false; - package = inputs.eww-systray.packages.${pkgs.system}.eww-wayland; - configDir = ./config; - }; -}