refactor: integrate fontconfig support

3 files changed, 14 insertions, 7 deletions

diff --git a/modules/foot.nix b/modules/foot.nix
index 4a297cd..2f2fff1 100644
--- a/modules/foot.nix
+++ b/modules/foot.nix
@@ -17,10 +17,7 @@ in
       };
       settings = {
         main = {
-          # font="ComicShannsMono Nerd Font Mono:size=12";
-          # font="BerkeleyMonoPatched Nerd Font Mono:size=12";
-          font ="CodeNewRoman Nerd Font Mono:size=12";
-          # font ="TamzenForPowerline:size=11,Cozette:size=11";
+          font ="monospace:size=12";
           title="term";
           resize-by-cells="no";
           pad="0x0 center";
diff --git a/modules/global.nix b/modules/global.nix
index 7bb28be..ff79f66 100644
--- a/modules/global.nix
+++ b/modules/global.nix
@@ -72,7 +72,15 @@ in
       };
     };
 
-    fonts.fontconfig.enable = true;
+    fonts.fontconfig = {
+      enable = true;
+      defaultFonts = {
+        monospace = [ "NotoMono Nerd Font Mono" ];
+        sansSerif = [ "Noto Sans" ];
+        serif = [ "Noto Serif" ];
+        emoji = [ "Noto Color Emoji"];
+      };
+    };
 
     dconf = {
       enable = true;
@@ -126,8 +134,10 @@ in
         binaryninja
         tamzen
         roboto
+        roboto-serif
         cozette
         inter
+        noto-fonts
         material-icons
       ] ++ (builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts))
         ++ (lib.optional cfg.notNixOS nixgl.auto.nixGLDefault)
diff --git a/modules/sway/default.nix b/modules/sway/default.nix
index 22fb206..fbe507f 100644
--- a/modules/sway/default.nix
+++ b/modules/sway/default.nix
@@ -51,7 +51,7 @@ in
         right = "i";
 
         fonts = {
-          names = [ "Roboto" ];
+          names = [ "monospace" ];
           # style = "Bold";
           size = 10.0;
         };
@@ -136,7 +136,7 @@ in
           # hiddenState = "hide";
           position = "top";
           fonts = {
-            names = [ "Hack Nerd Font Propo" "Material Icons Round" ];
+            names = [ "sans-serif" "monospace" ];
             size = "10.0";
           };
           extraConfig = ''