From d4a616275e8b9053f8443e676832a7d5eb24de69 Mon Sep 17 00:00:00 2001
From: kiana-S <kiana.a.sheibani@gmail.com>
Date: Thu, 21 Sep 2023 23:33:36 -0400
Subject: [PATCH] Replace Ubuntu Mono with JetBrains Mono

It doesn't really make sense to have two different fonts used in
different places around the UI. Sticking to one is more convenient and
looks better.
---
 config/config.nix                 | 4 ++--
 home-manager/wayland/mako.nix     | 2 +-
 home-manager/wayland/swaylock.nix | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/config/config.nix b/config/config.nix
index af76071..5662768 100644
--- a/config/config.nix
+++ b/config/config.nix
@@ -60,10 +60,10 @@ in
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
-      (nerdfonts.override { fonts = [ "UbuntuMono" "JetBrainsMono" "NerdFontsSymbolsOnly" ]; })
+      jetbrains-mono
+      (nerdfonts.override { fonts = [ "JetBrainsMono" "NerdFontsSymbolsOnly" ]; })
       font-awesome
       emacs-all-the-icons-fonts
-      ubuntu_font_family
       source-sans-pro
     ];
 
diff --git a/home-manager/wayland/mako.nix b/home-manager/wayland/mako.nix
index e75c5e7..725dcdb 100644
--- a/home-manager/wayland/mako.nix
+++ b/home-manager/wayland/mako.nix
@@ -3,7 +3,7 @@
   services.mako = {
     enable = true;
 
-    font = "UbuntuMono Light 11";
+    font = "JetBrainsMono Nerd Font 10";
     format = ''<i>%a</i>\n<b>%s</b>\n\n%b'';
     layer = "overlay";
     backgroundColor = "#111320d0";
diff --git a/home-manager/wayland/swaylock.nix b/home-manager/wayland/swaylock.nix
index 641a301..8bcf6b8 100644
--- a/home-manager/wayland/swaylock.nix
+++ b/home-manager/wayland/swaylock.nix
@@ -12,7 +12,7 @@
       indicator
       screenshots
 
-      font=UbuntuMono
+      font=JetBrainsMono
       text-color=ffffff
 
       color=00000000
@@ -26,7 +26,7 @@
 
 
       clock
-      datestr=%A, %Y-%m-%d
+      datestr=%a, %Y-%m-%d
 
       effect-scale=0.4
       effect-vignette=0.3:0.7