Eww reformatting and fixes

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 {

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"

config/eww/colour-scheme.scss

@@ -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;

config/eww/eww.scss

@@ -1 +1,2 @@
+@import './colour-scheme.scss'
 @import './bars/top-bar.scss'

config/eww/widgets/clock.yuck

@@ -4,23 +4,18 @@
 (defvar date-reveal false)
 
 (defwidget clock-module []
-  (eventbox
+  (eventbox :onhover "${EWW_CMD} update date-reveal=true"
-     :onhover "${EWW_CMD} update date-reveal=true"
+            :onhoverlost "${EWW_CMD} update date-reveal=false"
-     :onhoverlost "${EWW_CMD} update date-reveal=false"
+            (box :class "module clock"
-     (box
+                 :orientation "h"
-        :class "module clock"
+                 :space-evenly "false"
-        :orientation "h"
+                 (label :text clock-time
-        :space-evenly "false"
+                        :class "clock-time")
-        (label
+                 (revealer :transition "slideleft"
-           :text clock-time
+                           :duration "750ms"
-           :class "clock-time")
+                           :reveal {date-reveal}
-        (revealer
+                           (box :orientation "h"
-           :transition "slideleft"
+                                (label :text clock-date
-           :duration "750ms"
+                                       :class "clock-date")
-           :reveal {date-reveal}
+                                (label :text clock-year
-           (box
+                                       :class "clock-year"))))))
-              :orientation "h"
-              (label :text clock-date
-                     :class "clock-date")
-              (label :text clock-year
-                     :class "clock-year"))))))

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}"
+       (label :text "${workspaces}${current_workspace}"
-           :visible false)
+              :visible false)
     (for workspace in workspaces
-      (eventbox :onclick "hyprctl dispatch workspace ${workspace.id}"
+         (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 ? "" : ""}"
-          (label :text "${workspace.id == current_workspace ? "" : ""}"))))))
+                          :class "workspace-entry ${workspace.id == current_workspace ? "current" : ""} ${workspace.windows > 0 ? "occupied" : "empty"}")))))

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 = [