From bd61589f76f27bbc6d85477b2f817ccb87b38312 Mon Sep 17 00:00:00 2001
From: Daniel Patterson <me@danielpatterson.dev>
Date: Sat, 27 May 2023 20:02:00 +0100
Subject: [PATCH] Fix fonts

---
 hosts/common/graphical/default.nix             | 18 +++++++++++-------
 .../daniel/configs/desktop/waybar/config.json  | 12 +++++-------
 users/daniel/configs/desktop/waybar/style.css  |  2 +-
 users/daniel/configs/system/kitty/default.nix  |  5 +----
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/hosts/common/graphical/default.nix b/hosts/common/graphical/default.nix
index 3a251c0..a4c19b6 100644
--- a/hosts/common/graphical/default.nix
+++ b/hosts/common/graphical/default.nix
@@ -27,13 +27,17 @@
     };
   };
 
-  fonts.fonts = with pkgs; [
-    noto-fonts
-    noto-fonts-cjk
-    noto-fonts-emoji
-    (nerdfonts.override {fonts = ["Iosevka"];})
-    ubuntu_font_family
-  ];
+  fonts = {
+    fonts = with pkgs; [
+      noto-fonts
+      noto-fonts-cjk
+      noto-fonts-emoji
+      (nerdfonts.override {fonts = ["Iosevka"];})
+      ubuntu_font_family
+    ];
+
+    fontDir.enable = true;
+  };
 
   programs = {
     steam = {
diff --git a/users/daniel/configs/desktop/waybar/config.json b/users/daniel/configs/desktop/waybar/config.json
index 35e7adb..7539877 100644
--- a/users/daniel/configs/desktop/waybar/config.json
+++ b/users/daniel/configs/desktop/waybar/config.json
@@ -41,15 +41,13 @@
         "format-alt": "{:%a, %d. %b  %H:%M}"
     },
     "pulseaudio": {
-        "format": "󰕾{icon} {volume}%",
-        "format-muted": "",
+        "format": "{icon} {volume}%",
+        "format-muted": "󰖁 MUTED",
         "format-icons": {
             "default": [
-                "󰣾",
-                "󰣴",
-                "󰣶",
-                "󰣸",
-                "󰣺"
+                "󰕿",
+                "󰖀",
+                "󰕾"
             ]
         },
         "max-volume": 100,
diff --git a/users/daniel/configs/desktop/waybar/style.css b/users/daniel/configs/desktop/waybar/style.css
index ced6702..c53922f 100644
--- a/users/daniel/configs/desktop/waybar/style.css
+++ b/users/daniel/configs/desktop/waybar/style.css
@@ -23,7 +23,7 @@ window#waybar {
 * {
   border: none;
   min-height: 0;
-  font-family: "Font Awesome";
+  font-family: "Iosevka Nerd Font Propo", "Font Awesome";
   font-size: 16px;
 }
 
diff --git a/users/daniel/configs/system/kitty/default.nix b/users/daniel/configs/system/kitty/default.nix
index 28b7da5..e7725be 100644
--- a/users/daniel/configs/system/kitty/default.nix
+++ b/users/daniel/configs/system/kitty/default.nix
@@ -2,8 +2,7 @@
   programs.kitty = {
     enable = true;
     font = {
-      package = pkgs.iosevka;
-      name = "Iosevka Nerd Font Complete";
+      name = "Iosevka Nerd Font";
     };
     settings = {
       "include" = "catppuccin.conf";
@@ -14,8 +13,6 @@
       "cursor_shape" = "underline";
       "cursor_blink_interval" = 0;
 
-      "bold_font" = "Iosevka Nerd Font Complete Bold";
-
       "disable_ligatures" = "always";
 
       "enable_audio_bell" = "no";