From e5f8a2d975b54a5b6dac61a12a9c94bed96ce7ef Mon Sep 17 00:00:00 2001
From: liv <shadows@with.al>
Date: Tue, 13 Aug 2024 14:55:23 +0200
Subject: [PATCH] add bitmap font support

---
 home/common/desktop/font.nix   |  4 ++++
 home/common/desktop/waybar.nix | 31 ++++++++++---------------------
 modules/home-manager/fonts.nix |  2 ++
 3 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/home/common/desktop/font.nix b/home/common/desktop/font.nix
index 086c0cf..e2ec821 100644
--- a/home/common/desktop/font.nix
+++ b/home/common/desktop/font.nix
@@ -9,5 +9,9 @@
       family = "Fira Sans";
       package = pkgs.fira;
     };
+    bitmap = {
+      family = "Tamzen";
+      package = pkgs.tamzen;
+    };
   };
 }
diff --git a/home/common/desktop/waybar.nix b/home/common/desktop/waybar.nix
index c643f3e..2e5f370 100644
--- a/home/common/desktop/waybar.nix
+++ b/home/common/desktop/waybar.nix
@@ -3,20 +3,19 @@
 }: {
   systemd.user.services.waybar = {
     Unit.StartLimitBurst = 30;
+    # this fixes fonts for some reason
+    Service.Environment = "PATH=${config.home.profileDirectory}/bin";
   };
-
   programs.waybar = {
     enable = true;
     systemd.enable = true;
     settings = {
       primary = {
-        # exclusive = false;
-        # passthrough = false;
         height = 40;
         position = "top";
-        margin-top = 6;
-        margin-left = 6;
-        margin-right = 6;
+        margin-top = 10;
+        margin-left = 20;
+        margin-right = 20;
         modules-left = [
           "hyprland/workspaces"
           "hyprland/submap"
@@ -41,10 +40,9 @@
       inherit (config.lib.stylix.colors) withHashtag;
     in ''
     * {
-      font-family: ${config.fontProfiles.regular.family}, ${config.fontProfiles.monospace.family};
+      font-family: ${config.fontProfiles.bitmap.family}, ${config.fontProfiles.monospace.family};
       font-size: 12pt;
       padding: 0;
-      margin: 0 0.4em;
     }
 
     window#waybar {
@@ -52,23 +50,14 @@
       border-radius: 0.5em;
     }
 
-    .modules-left {
-      margin-left: -0.65em;
-    }
-    .modules-right {
-      margin-right: -0.65em;
-    }
-
-    #workspaces button {
-      padding-left: 0.4em;
-      padding-right: 0.4em;
-      margin-top: 0.15em;
-      margin-bottom: 0.15em;
+    #workspaces {
+      transition: background-color .5s, color .5s;
     }
 
     #workspaces button.active,
     #workspaces button.focused {
-      background-color: ${withHashtag.base08};
+      background-color: ${withHashtag.base05};
+      color: ${withHashtag.base00};
     }
     '';
   };
diff --git a/modules/home-manager/fonts.nix b/modules/home-manager/fonts.nix
index 0df65dc..fab19e0 100644
--- a/modules/home-manager/fonts.nix
+++ b/modules/home-manager/fonts.nix
@@ -23,6 +23,7 @@ in {
     enable = lib.mkEnableOption "Whether to enable font profiles";
     monospace = mkFontOption "monospace";
     regular = mkFontOption "regular";
+    bitmap = mkFontOption "bitmap";
   };
 
   config = lib.mkIf cfg.enable {
@@ -30,6 +31,7 @@ in {
     home.packages = [
       cfg.monospace.package
       cfg.regular.package
+      cfg.bitmap.package
     ];
   };
 }