1 files changed, 45 insertions, 2 deletions
diff --git a/modules/desktop/eww/default.nix b/modules/desktop/eww/default.nix
index e22f8c6..fad0cc4 100644
--- a/modules/desktop/eww/default.nix
+++ b/modules/desktop/eww/default.nix
@@ -5,7 +5,7 @@
 }:
 {
   imports = [
-    ./yuck.nix
+    ./bar.nix
   ];
 
   options.desktop.eww = {
@@ -21,7 +21,50 @@
     programs.eww = {
       enable = true;
       systemd.enable = true;
-      scssConfig = builtins.readFile (import ./scss.nix { inherit config; });
+      scssConfig =
+        let
+          baseSize = config.fonts.size;
+        in
+        builtins.readFile (
+          config.scheme {
+            template =
+              builtins.replaceStrings
+                [
+                  "@@font-family@@"
+                  "@@font-size@@"
+                  "@@font-size-icon@@"
+                  "@@font-size-label@@"
+                  "@@font-size-small@@"
+                  "@@font-size-idx@@"
+                ]
+                [
+                  config.fonts.normal
+                  (toString baseSize)
+                  (toString (baseSize + 6))
+                  (toString (baseSize - 2))
+                  (toString (baseSize - 6))
+                  (toString (baseSize - 4))
+                ]
+                (builtins.readFile ./eww.mustache.scss);
+          }
+        );
+    };
+
+    systemd.user.services.eww-bar = {
+      Unit = {
+        Description = "Open Eww Bar";
+        After = [ "eww.service" ];
+        Requires = [ "eww.service" ];
+      };
+      Service = {
+        Type = "oneshot";
+        RemainAfterExit = true;
+        ExecStart = "${lib.getExe config.desktop.eww.package} open bar";
+        ExecStop = "${lib.getExe config.desktop.eww.package} close bar";
+      };
+      Install = {
+        WantedBy = [ config.programs.eww.systemd.target ];
+      };
     };
   };
 }