From e046860c7ca892be322f2df64710c39d7c20cc21 Mon Sep 17 00:00:00 2001
From: Pihkaal <pihkaal@proton.me>
Date: Thu, 12 Sep 2024 21:38:34 +0200
Subject: [PATCH] refactor: only use medium nerdfont

---
 src/components/Music/SpotifyPlayer.tsx        |  4 ++-
 .../Waybar/Widgets/WaybarBatteryWidget.tsx    |  3 ++-
 .../Waybar/Widgets/WaybarBrightnessWidget.tsx |  3 ++-
 .../Waybar/Widgets/WaybarCPUWidget.tsx        |  2 +-
 .../Waybar/Widgets/WaybarDiskWidget.tsx       |  2 +-
 .../Waybar/Widgets/WaybarHomeWidget.tsx       |  4 ++-
 .../Waybar/Widgets/WaybarLockWidget.tsx       |  2 +-
 .../Waybar/Widgets/WaybarMicrophoneWidget.tsx |  2 +-
 .../Waybar/Widgets/WaybarPowerWidget.tsx      |  2 +-
 .../Waybar/Widgets/WaybarRAMWidget.tsx        |  2 +-
 .../Widgets/WaybarTemperatureWidget.tsx       |  2 +-
 .../Widgets/WaybarToggleThemeWidget.tsx       |  2 +-
 .../Waybar/Widgets/WaybarVolumeWidget.tsx     |  2 +-
 src/index.scss                                | 26 +++----------------
 14 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/src/components/Music/SpotifyPlayer.tsx b/src/components/Music/SpotifyPlayer.tsx
index cd8bfcb..ac74863 100644
--- a/src/components/Music/SpotifyPlayer.tsx
+++ b/src/components/Music/SpotifyPlayer.tsx
@@ -128,7 +128,9 @@ const InnerSpotifyPlayer = (props: InnerKittyProps<typeof SpotifyPlayer>) => {
       {/* body */}
       <div className="overflow-hidden" style={{ gridArea: "2 / 2 / 3 / 4" }}>
         <span className="font-extrabold text-color6">
-          <span>{false ? "\udb81\udc0a " : "\udb80\udfe4 "}</span>
+          <span className="font-normal">
+            {false ? "\udb81\udc0a " : "\udb80\udfe4 "}
+          </span>
           {props.playing.item.name} ·{" "}
           {props.playing.item.artists.map((a) => a.name).join(", ")}
         </span>
diff --git a/src/components/Waybar/Widgets/WaybarBatteryWidget.tsx b/src/components/Waybar/Widgets/WaybarBatteryWidget.tsx
index 62294cb..c4cb0f6 100644
--- a/src/components/Waybar/Widgets/WaybarBatteryWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarBatteryWidget.tsx
@@ -39,7 +39,8 @@ export const WaybarBatteryWidget = (props: { frequency: number }) => {
       className="pl-[0.625rem] pr-3 text-[#1d7715]"
       tooltip={tooltip}
     >
-      {lerpIcon(ICONS, battery, 100)} {battery}%
+      <span className="font-normal">{lerpIcon(ICONS, battery, 100)}</span>{" "}
+      {battery}%
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarBrightnessWidget.tsx b/src/components/Waybar/Widgets/WaybarBrightnessWidget.tsx
index caa44f0..c71b03b 100644
--- a/src/components/Waybar/Widgets/WaybarBrightnessWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarBrightnessWidget.tsx
@@ -34,7 +34,8 @@ export const WaybarBrightnessWidget = () => {
   return (
     <WaybarWidget className="pl-3 pr-[0.625rem]" tooltip={tooltip}>
       <span onWheel={handleScroll}>
-        {lerpIcon(ICONS, brightness, 100)} {brightness}%
+        <span className="font-normal">{lerpIcon(ICONS, brightness, 100)}</span>{" "}
+        {brightness}%
       </span>
     </WaybarWidget>
   );
diff --git a/src/components/Waybar/Widgets/WaybarCPUWidget.tsx b/src/components/Waybar/Widgets/WaybarCPUWidget.tsx
index cdc6b4b..a4cabca 100644
--- a/src/components/Waybar/Widgets/WaybarCPUWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarCPUWidget.tsx
@@ -45,7 +45,7 @@ export const WaybarCPUWidget = (props: {
         </ul>
       }
     >
-       {totalUsage}%
+      <span className="font-normal"></span> {totalUsage}%
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarDiskWidget.tsx b/src/components/Waybar/Widgets/WaybarDiskWidget.tsx
index e2f91a9..bedbf1d 100644
--- a/src/components/Waybar/Widgets/WaybarDiskWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarDiskWidget.tsx
@@ -21,7 +21,7 @@ export const WaybarDiskWidget = (props: {
         props.capacity
       }GiB on / (${usage}%)`}
     >
-      󰋊 {usage}%
+      <span className="font-normal">󰋊</span> {usage}%
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarHomeWidget.tsx b/src/components/Waybar/Widgets/WaybarHomeWidget.tsx
index 7d6e8c8..2380a6f 100644
--- a/src/components/Waybar/Widgets/WaybarHomeWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarHomeWidget.tsx
@@ -1,5 +1,7 @@
 import { WaybarWidget } from "../WaybarWidget";
 
 export const WaybarHomeWidget = () => (
-  <WaybarWidget className="text-[#407cdd]"></WaybarWidget>
+  <WaybarWidget className="text-[#407cdd]">
+    <span className="font-normal"></span>
+  </WaybarWidget>
 );
diff --git a/src/components/Waybar/Widgets/WaybarLockWidget.tsx b/src/components/Waybar/Widgets/WaybarLockWidget.tsx
index 723174e..2558de4 100644
--- a/src/components/Waybar/Widgets/WaybarLockWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarLockWidget.tsx
@@ -10,7 +10,7 @@ export const WaybarLockWidget = () => {
       onClick={() => setState("login")}
       interactable
     >
-      <button></button>
+      <span className="font-normal"></span>
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarMicrophoneWidget.tsx b/src/components/Waybar/Widgets/WaybarMicrophoneWidget.tsx
index f6db77f..6ecb97e 100644
--- a/src/components/Waybar/Widgets/WaybarMicrophoneWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarMicrophoneWidget.tsx
@@ -37,7 +37,7 @@ export const WaybarMicrophoneWidget = () => {
         onWheel={handleWheel}
         onClick={handleClick}
       >
-        {icon} {!muted && `${volume}%`}
+        <span className="font-normal">{icon}</span> {!muted && `${volume}%`}
       </span>
     </WaybarWidget>
   );
diff --git a/src/components/Waybar/Widgets/WaybarPowerWidget.tsx b/src/components/Waybar/Widgets/WaybarPowerWidget.tsx
index 8cbc8a2..444f186 100644
--- a/src/components/Waybar/Widgets/WaybarPowerWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarPowerWidget.tsx
@@ -10,7 +10,7 @@ export const WaybarPowerWidget = () => {
       onClick={() => setState("off")}
       interactable
     >
-      <button></button>
+      <span className="font-normal"></span>
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarRAMWidget.tsx b/src/components/Waybar/Widgets/WaybarRAMWidget.tsx
index b0286be..ddfdce9 100644
--- a/src/components/Waybar/Widgets/WaybarRAMWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarRAMWidget.tsx
@@ -33,7 +33,7 @@ export const WaybarRAMWidget = (props: {
       className="px-[0.625rem]"
       tooltip={`Memory - ${used.toFixed(1)}GB used`}
     >
-       {usage}%
+      <span className="font-normal"></span> {usage}%
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarTemperatureWidget.tsx b/src/components/Waybar/Widgets/WaybarTemperatureWidget.tsx
index 323a45b..e563d20 100644
--- a/src/components/Waybar/Widgets/WaybarTemperatureWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarTemperatureWidget.tsx
@@ -26,7 +26,7 @@ export const WaybarTemperatureWidget = (props: {
       className="pl-3 pr-[0.625rem]"
       tooltip="All good until I start playing btd6"
     >
-       {temperature}°C
+      <span className="font-normal"></span> {temperature}°C
     </WaybarWidget>
   );
 };
diff --git a/src/components/Waybar/Widgets/WaybarToggleThemeWidget.tsx b/src/components/Waybar/Widgets/WaybarToggleThemeWidget.tsx
index 9fe042e..7081307 100644
--- a/src/components/Waybar/Widgets/WaybarToggleThemeWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarToggleThemeWidget.tsx
@@ -2,6 +2,6 @@ import { WaybarWidget } from "../WaybarWidget";
 
 export const WaybarToggleThemeWidget = () => (
   <WaybarWidget className="pl-[0.625rem] pr-3" interactable>
-    󰐾
+    <span className="font-normal">󰐾</span>
   </WaybarWidget>
 );
diff --git a/src/components/Waybar/Widgets/WaybarVolumeWidget.tsx b/src/components/Waybar/Widgets/WaybarVolumeWidget.tsx
index 6ac84f7..2b51f2b 100644
--- a/src/components/Waybar/Widgets/WaybarVolumeWidget.tsx
+++ b/src/components/Waybar/Widgets/WaybarVolumeWidget.tsx
@@ -39,7 +39,7 @@ export const WaybarVolumeWidget = () => {
         onWheel={handleWheel}
         onClick={handleClick}
       >
-        {icon} {!muted && `${volume}%`}
+        <span className="font-normal">{icon}</span> {!muted && `${volume}%`}
       </span>
     </WaybarWidget>
   );
diff --git a/src/index.scss b/src/index.scss
index ca23741..b98e9c3 100644
--- a/src/index.scss
+++ b/src/index.scss
@@ -13,9 +13,11 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+@import url(https://fonts.bunny.net/css?family=jetbrains-mono:700,800);
+
 body {
   margin: 0;
-  font-family: "JetBrainsMono";
+  font-family: "JetBrains Mono";
 }
 
 *::selection {
@@ -23,7 +25,7 @@ body {
 }
 
 @font-face {
-  font-family: "JetBrainsMono";
+  font-family: "JetBrains Mono";
   src:
     url("/fonts/JetBrainsMonoNF-Medium.woff2") format("woff2"),
     url("/fonts/JetBrainsMonoNF-Medium.woff") format("woff");
@@ -32,26 +34,6 @@ body {
   font-display: swap;
 }
 
-@font-face {
-  font-family: "JetBrainsMono";
-  src:
-    url("/fonts/JetBrainsMonoNF-Bold.woff2") format("woff2"),
-    url("/fonts/JetBrainsMonoNF-Bold.woff") format("woff");
-  font-weight: 700;
-  font-style: normal;
-  font-display: swap;
-}
-
-@font-face {
-  font-family: "JetBrainsMono";
-  src:
-    url("/fonts/JetBrainsMonoNF-ExtraBold.woff2") format("woff2"),
-    url("/fonts/JetBrainsMonoNF-ExtraBold.woff") format("woff");
-  font-weight: 800;
-  font-style: normal;
-  font-display: swap;
-}
-
 .drop-shadow-white:hover {
   filter: drop-shadow(0px 0px 4px rgba(255, 255, 255, 1));
 }