From f5034dca81443f1c8e2d220f1beb1fa9430958bc Mon Sep 17 00:00:00 2001 From: notohh Date: Mon, 13 May 2024 16:18:49 -0400 Subject: [PATCH] eww: enable --- home/programs/eww/config/eww.scss | 2 +- home/programs/eww/config/eww.yuck | 2 +- home/programs/eww/config/style/menu.scss | 16 +++++++------- home/programs/eww/config/style/music.scss | 24 ++++++++++++++------- home/programs/eww/config/vars.yuck | 4 ++-- home/programs/eww/config/widgets/menu.yuck | 4 ++-- home/programs/eww/config/widgets/music.yuck | 4 ++-- home/programs/eww/default.nix | 5 +++-- 8 files changed, 35 insertions(+), 26 deletions(-) diff --git a/home/programs/eww/config/eww.scss b/home/programs/eww/config/eww.scss index 75620b4..2b5dd3a 100644 --- a/home/programs/eww/config/eww.scss +++ b/home/programs/eww/config/eww.scss @@ -16,7 +16,7 @@ .time { font-size: 16px; - margin: 0.5rem 1.2rem 0.5rem 1rem; + margin: 0.5rem 1rem 0.5rem 1rem; padding-left: 0.4rem; padding-right: 0.4rem; border-radius: 8px; diff --git a/home/programs/eww/config/eww.yuck b/home/programs/eww/config/eww.yuck index 7282ae1..4b26ff7 100644 --- a/home/programs/eww/config/eww.yuck +++ b/home/programs/eww/config/eww.yuck @@ -33,7 +33,7 @@ (defwindow bar - :monitor 2 + :monitor 1 :windowtype "dock" :geometry (geometry :x "0%" diff --git a/home/programs/eww/config/style/menu.scss b/home/programs/eww/config/style/menu.scss index 66cceca..cd8b838 100644 --- a/home/programs/eww/config/style/menu.scss +++ b/home/programs/eww/config/style/menu.scss @@ -1,6 +1,14 @@ @import "./mixins.scss"; @import "./colors.scss"; +.menu-widget { + font-size: 20px; + margin: 0.5rem 1.2rem 0.5rem 1.5rem; + padding-right: 0.3rem; + border-radius: 8px; + background-color: $background; +} + .menubox { border: 3px solid $background-highlight; border-radius: 10px; @@ -32,14 +40,6 @@ } } -.menu-widget { - font-size: 20px; - margin: 0.5rem 1.2rem 0.5rem 0.9rem; - padding-right: 0.3rem; - border-radius: 8px; - background-color: $background; -} - .cpu { @include sysinfo(); color: $red; diff --git a/home/programs/eww/config/style/music.scss b/home/programs/eww/config/style/music.scss index 3bee79f..34d609f 100644 --- a/home/programs/eww/config/style/music.scss +++ b/home/programs/eww/config/style/music.scss @@ -56,18 +56,26 @@ border: 3px solid $background-highlight; } -.hover-play:hover { - background-color: $green; - transition: all 100ms ease-in; - color: $background-highlight; +.hover-play { + transition: all 200ms ease; border-radius: 5px; + &:hover { + background-color: $green; + transition: all 200ms ease; + color: $background-highlight; + border-radius: 5px; + } } -.hover-pause:hover { - background-color: $red; - transition: all 200ms ease-in; - color: $background-highlight; +.hover-pause { + transition: all 200ms ease; border-radius: 5px; + &:hover { + background-color: $red; + transition: all 200ms ease; + color: $background-highlight; + border-radius: 5px; + } } .close-button { diff --git a/home/programs/eww/config/vars.yuck b/home/programs/eww/config/vars.yuck index a14cf18..7bb8f1e 100644 --- a/home/programs/eww/config/vars.yuck +++ b/home/programs/eww/config/vars.yuck @@ -1,6 +1,6 @@ (deflisten musicArtist :initial "-" "playerctl --follow metadata --format '{{ artist }}'") (deflisten musicTitle :initial "-" "playerctl --follow metadata --format '{{title}}'") -(deflisten musicCover "sh ~/.config/eww/scripts/get-music-cover.sh ~/.config/eww/cache_directory") +(deflisten musicCover "sh /home/notoh/snowflake/home/programs/eww/config/scripts/get-music-cover.sh /tmp/eww/cache_directory") (defpoll time :interval "60s" @@ -11,4 +11,4 @@ :initial "initial-value" `date +%D-%Y`) -(defpoll uptime :interval "1s" "uptime | awk '{print $3}' | tr ',' ' '") \ No newline at end of file +(defpoll uptime :interval "1s" "uptime | awk '{print $3}' | tr ',' ' '") diff --git a/home/programs/eww/config/widgets/menu.yuck b/home/programs/eww/config/widgets/menu.yuck index 1bbc032..8056b87 100644 --- a/home/programs/eww/config/widgets/menu.yuck +++ b/home/programs/eww/config/widgets/menu.yuck @@ -56,7 +56,7 @@ ) (defwindow menu-window - :monitor 2 + :monitor 1 :windowtype "dock" :geometry (geometry :x "0.9%" @@ -68,4 +68,4 @@ :windowtype "dock" :wm-ignore true :exclusive false - (menubox)) \ No newline at end of file + (menubox)) diff --git a/home/programs/eww/config/widgets/music.yuck b/home/programs/eww/config/widgets/music.yuck index 9942259..ccf1e1e 100644 --- a/home/programs/eww/config/widgets/music.yuck +++ b/home/programs/eww/config/widgets/music.yuck @@ -39,7 +39,7 @@ (bar-art))) (defwindow music-widget - :monitor 2 + :monitor 1 :windowtype "dock" :namespace "music-widget" :geometry (geometry @@ -52,4 +52,4 @@ :windowtype "dock" :wm-ignore true :exclusive false - (music-widget)) \ No newline at end of file + (music-widget)) diff --git a/home/programs/eww/default.nix b/home/programs/eww/default.nix index 7af522c..a5738ce 100644 --- a/home/programs/eww/default.nix +++ b/home/programs/eww/default.nix @@ -6,7 +6,8 @@ ]; programs.eww = { - enable = false; - package = pkgs.eww-wayland; + enable = true; + package = pkgs.eww; + configDir = ./config; }; }