refactor(config): better way of installing nerd fonts

zakuciael · Jun 1, 2024 · ced25b6 · ced25b6
1 parent edbff8c
commit ced25b6
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 13 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -37,6 +37,7 @@
         "ehci",
         "Filesystems",
         "flatpak",
+        "fontconfig",
         "Hyprland",
         "hyprpaper",
         "insmod",

diff --git a/configuration.nix b/configuration.nix
@@ -57,15 +57,36 @@
   services.xserver.xkb.layout = "pl";
 
   # Fonts
-  fonts.packages = with pkgs; [
-    noto-fonts
-    noto-fonts-extra
-    noto-fonts-color-emoji
-    noto-fonts-cjk-sans
-    noto-fonts-cjk-serif
-    noto-fonts-emoji-blob-bin
-    nerdfonts
-  ];
+  fonts = {
+    packages = with pkgs; [
+      noto-fonts
+      noto-fonts-extra
+      noto-fonts-color-emoji
+      noto-fonts-cjk-sans
+      noto-fonts-cjk-serif
+      noto-fonts-emoji-blob-bin
+      jetbrains-mono
+      icomoon-feather
+      (nerdfonts.override {fonts = ["NerdFontsSymbolsOnly"];})
+    ];
+    fontconfig = {
+      enable = true;
+      localConf = ''
+        <?xml version="1.0"?>
+        <!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+        <fontconfig>
+          <alias>
+            <family>JetBrains Mono</family>
+            <prefer>
+              <family>JetBrains Mono</family>
+              <family>icomoon-feather</family>
+              <family>Symbols Nerd Font Mono</family>
+            </prefer>
+          </alias>
+        </fontconfig>
+      '';
+    };
+  };
 
   # Global packages
   environment = {

diff --git a/dotfiles/rofi/launchers/fonts.rasi b/dotfiles/rofi/launchers/fonts.rasi
@@ -8,5 +8,5 @@
  **/
 
 * {
-    font: "JetBrainsMono Nerd Font 10";
+    font: "JetBrains Mono 10";
 }
diff --git a/dotfiles/rofi/powermenu/fonts.rasi b/dotfiles/rofi/powermenu/fonts.rasi
@@ -8,5 +8,5 @@
  **/
 
 * {
-    font: "JetBrainsMono Nerd Font 10";
+    font: "JetBrains Mono 10";
 }
diff --git a/modules/desktop/apps/alacritty.nix b/modules/desktop/apps/alacritty.nix
@@ -27,7 +27,7 @@ with lib; {
         scrolling.history = 100000;
         font = {
           normal = {
-            family = "JetBrainsMono Nerd Font Mono";
+            family = "JetBrains Mono";
             style = "Regular";
           };
           size = 11;

diff --git a/modules/desktop/apps/waybar.nix b/modules/desktop/apps/waybar.nix
@@ -95,7 +95,7 @@ in {
       style = with colorScheme.palette; ''
         * {
           font-size: 14px;
-          font-family: JetBrainsMono Nerd Font, Font Awesome, sans-serif;
+          font-family: JetBrains Mono, sans-serif;
           font-weight: bold;
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,5 +8,5 @@ @@
      **/
     * {
-        font: "JetBrainsMono Nerd Font 10";
+        font: "JetBrains Mono 10";
     }