treewide: use Inter instead of Lexend

fufexan · Nov 6, 2023 · dc8fa44 · dc8fa44
1 parent e207225
commit dc8fa44
Show file tree

Hide file tree

Showing 12 changed files with 9 additions and 14 deletions.
diff --git a/home/programs/dunst.nix b/home/programs/dunst.nix
@@ -16,7 +16,7 @@
         alignment = "center";
         corner_radius = 16;
         follow = "mouse";
-        font = "Roboto 10";
+        font = "Inter 9";
         format = "<b>%s</b>\\n%b";
         frame_width = 1;
         offset = "5x5";

diff --git a/home/programs/eww/README.md b/home/programs/eww/README.md
@@ -64,7 +64,7 @@ Dependencies:
 
 - Icon fonts: [Material Symbols Outlined](https://github.com/google/material-design-icons/tree/master/variablefont)
   (any variation can be used as long as you change the `font-family` property of `.icon`)
-- Text font: Lexend
+- Text font: Inter or Roboto
 - Script deps: everything in `default.nix`'s `dependencies` list.
 - [gross](https://github.com/fufexan/gross)
 

diff --git a/home/programs/eww/css/prelude.scss b/home/programs/eww/css/prelude.scss
@@ -1,6 +1,6 @@
 /* get rid of GTK theme's styles and set defaults */
 * {
   all: unset;
-  font-family: Lexend, Roboto, sans-serif;
+  font-family: Inter, Roboto, sans-serif;
   transition: 200ms ease;
 }
diff --git a/home/programs/files/wlogout.nix b/home/programs/files/wlogout.nix
@@ -12,7 +12,6 @@ in {
   xdg.configFile."wlogout/style.css".text = ''
     * {
       background: none;
-      font-family: Lexend, sans-serif;
     }
 
     window {

diff --git a/home/programs/gtk.nix b/home/programs/gtk.nix
@@ -17,8 +17,8 @@ in {
     enable = true;
 
     font = {
-      name = "Roboto";
-      package = pkgs.roboto;
+      name = "Inter";
+      package = pkgs.google-fonts.override {fonts = ["Inter"];};
       size = 9;
     };
 

diff --git a/home/programs/zathura.nix b/home/programs/zathura.nix
@@ -9,7 +9,7 @@
       recolor-lightcolor = "rgba(0,0,0,0)";
       default-bg = "rgba(0,0,0,0.7)";
 
-      font = "Lexend 12";
+      font = "Inter 12";
       selection-notification = true;
 
       selection-clipboard = "clipboard";

diff --git a/home/wayland/anyrun/style-dark.css b/home/wayland/anyrun/style-dark.css
@@ -1,6 +1,5 @@
 * {
   all: unset;
-  font-family: Lexend;
   font-size: 1.3rem;
 }
 

diff --git a/home/wayland/anyrun/style-light.css b/home/wayland/anyrun/style-light.css
@@ -1,6 +1,5 @@
 * {
   all: unset;
-  font-family: Lexend;
   font-size: 1.3rem;
   color: black;
 }

diff --git a/home/wayland/gtklock/style-dark.css b/home/wayland/gtklock/style-dark.css
@@ -1,6 +1,5 @@
 window {
   background: rgba(0, 0, 0, 0.5);
-  font-family: Lexend;
 }
 
 grid > label {

diff --git a/home/wayland/gtklock/style-light.css b/home/wayland/gtklock/style-light.css
@@ -1,6 +1,5 @@
 window {
   background: rgba(255, 255, 255, 0.3);
-  font-family: Lexend;
 }
 
 grid > label {

diff --git a/modules/desktop.nix b/modules/desktop.nix
@@ -15,11 +15,11 @@
       material-symbols
 
       # normal fonts
-      lexend
       noto-fonts
       noto-fonts-cjk
       noto-fonts-emoji
       roboto
+      (google-fonts.override {fonts = ["Inter"];})
 
       # nerdfonts
       (nerdfonts.override {fonts = ["FiraCode" "JetBrainsMono"];})
@@ -33,7 +33,7 @@
     # B&W emojis that would sometimes show instead of some Color emojis
     fontconfig.defaultFonts = {
       serif = ["Roboto Serif" "Noto Color Emoji"];
-      sansSerif = ["Roboto" "Noto Color Emoji"];
+      sansSerif = ["Inter" "Noto Color Emoji"];
       monospace = ["JetBrainsMono Nerd Font" "Noto Color Emoji"];
       emoji = ["Noto Color Emoji"];
     };

diff --git a/modules/greetd.nix b/modules/greetd.nix
@@ -73,7 +73,7 @@ in {
       };
       GTK = {
         cursor_theme_name = "Bibata-Modern-Classic";
-        font_name = "Lexend 9";
+        font_name = "Inter 9";
         icon_theme_name = "Papirus-Dark";
         theme_name = themeName;
       };