diff --git a/config/eww/bars/top-bar.scss b/config/eww/bars/top-bar.scss index 65878b8..f5b55dc 100644 --- a/config/eww/bars/top-bar.scss +++ b/config/eww/bars/top-bar.scss @@ -1,5 +1,3 @@ -@import './colour-scheme.scss' - *{ all: unset; font-family: Iosevka; @@ -42,7 +40,7 @@ tooltip label { /** Wifi **/ .wifi { - color: $base0C; + color: $base0D; } .wifi-text { diff --git a/config/eww/bars/top-bar.yuck b/config/eww/bars/top-bar.yuck index bc31f86..6da05ea 100644 --- a/config/eww/bars/top-bar.yuck +++ b/config/eww/bars/top-bar.yuck @@ -22,7 +22,6 @@ (bar-center) (bar-right))) - (defwidget bar-left [] (box :halign "start" :orientation "h" @@ -32,7 +31,6 @@ (box :halign "center" :orientation "h")) - (defwidget bar-right [] (box :halign "end" :orientation "h" diff --git a/config/eww/colour-scheme.scss b/config/eww/colour-scheme.scss deleted file mode 100644 index 3901c17..0000000 --- a/config/eww/colour-scheme.scss +++ /dev/null @@ -1,16 +0,0 @@ -$base00: #1c2735; -$base01: #3e4856; -$base02: #616a76; -$base03: #838c97; -$base04: #a5adb7; -$base05: #c7cfd7; -$base06: #cfd6dd; -$base07: #d8dde3; -$base08: #ec5b5c; -$base09: #667b87; -$base0A: #547f87; -$base0B: #7c7399; -$base0C: #b25b8e; -$base0D: #b75a80; -$base0E: #d4445b; -$base0F: #5d7aa2; diff --git a/config/eww/eww.scss b/config/eww/eww.scss index 88a902c..8705ff8 100644 --- a/config/eww/eww.scss +++ b/config/eww/eww.scss @@ -1 +1,2 @@ +@import './colour-scheme.scss' @import './bars/top-bar.scss' diff --git a/config/eww/widgets/clock.yuck b/config/eww/widgets/clock.yuck index cbc43bc..57d0c1a 100644 --- a/config/eww/widgets/clock.yuck +++ b/config/eww/widgets/clock.yuck @@ -4,23 +4,18 @@ (defvar date-reveal false) (defwidget clock-module [] - (eventbox - :onhover "${EWW_CMD} update date-reveal=true" - :onhoverlost "${EWW_CMD} update date-reveal=false" - (box - :class "module clock" - :orientation "h" - :space-evenly "false" - (label - :text clock-time - :class "clock-time") - (revealer - :transition "slideleft" - :duration "750ms" - :reveal {date-reveal} - (box - :orientation "h" - (label :text clock-date - :class "clock-date") - (label :text clock-year - :class "clock-year")))))) + (eventbox :onhover "${EWW_CMD} update date-reveal=true" + :onhoverlost "${EWW_CMD} update date-reveal=false" + (box :class "module clock" + :orientation "h" + :space-evenly "false" + (label :text clock-time + :class "clock-time") + (revealer :transition "slideleft" + :duration "750ms" + :reveal {date-reveal} + (box :orientation "h" + (label :text clock-date + :class "clock-date") + (label :text clock-year + :class "clock-year")))))) diff --git a/config/eww/widgets/workspaces.yuck b/config/eww/widgets/workspaces.yuck index 5a9ccd0..02cdd4d 100644 --- a/config/eww/widgets/workspaces.yuck +++ b/config/eww/widgets/workspaces.yuck @@ -2,9 +2,9 @@ (deflisten current_workspace :initial "1" "bash ~/.config/eww/scripts/get-active-workspace.sh") (defwidget workspaces-module [] (box :space-evenly true - (label :text "${workspaces}${current_workspace}" - :visible false) + (label :text "${workspaces}${current_workspace}" + :visible false) (for workspace in workspaces - (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}" - (box :class "workspace-entry ${workspace.id == current_workspace ? "current" : ""} ${workspace.windows > 0 ? "occupied" : "empty"}" - (label :text "${workspace.id == current_workspace ? "" : ""}")))))) + (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}" + (label :text "${workspace.id == current_workspace ? "" : ""}" + :class "workspace-entry ${workspace.id == current_workspace ? "current" : ""} ${workspace.windows > 0 ? "occupied" : "empty"}"))))) diff --git a/data/wallpapers/wallhaven/canyon.jpg b/data/wallpapers/wallhaven/canyon.jpg new file mode 100644 index 0000000..2ac3c7e Binary files /dev/null and b/data/wallpapers/wallhaven/canyon.jpg differ diff --git a/hosts/reykjavik/default.nix b/hosts/reykjavik/default.nix index bb253ce..ebfdffd 100644 --- a/hosts/reykjavik/default.nix +++ b/hosts/reykjavik/default.nix @@ -3,7 +3,7 @@ with lib; let nix-colors-lib = inputs.nix-colors.lib-contrib { inherit pkgs; }; - wallpaper = ../../data/wallpapers/globus.jpg; + wallpaper = ../../data/wallpapers/wallhaven/canyon.jpg; in { imports = [