diff --git a/home-manager/common/programs/terminal.nix b/home-manager/common/programs/terminal.nix index 2a55e92..513e421 100644 --- a/home-manager/common/programs/terminal.nix +++ b/home-manager/common/programs/terminal.nix @@ -18,12 +18,12 @@ in with lib; { ALACRITTY = "1"; }; font = { - normal.family = "FiraCode Nerd Font"; - bold.family = "FiraCode Nerd Font"; - italic.family = "FiraCode Nerd Font"; - bold_italic.family = "FiraCode Nerd Font"; + normal.family = "Iosevka Term"; + bold.family = "Iosevka Term"; + italic.family = "Iosevka Term"; + bold_italic.family = "Iosevka Term"; # Bigger on darwin - size = if pkgs.stdenv.isLinux then 9.0 else 11.0; + size = if pkgs.stdenv.isLinux then 10.0 else 12.0; }; colors = { primary = { diff --git a/home-manager/linux/programs/sway.nix b/home-manager/linux/programs/sway.nix index 172db5e..12cab1b 100644 --- a/home-manager/linux/programs/sway.nix +++ b/home-manager/linux/programs/sway.nix @@ -96,7 +96,7 @@ in with lib; { terminal = "alacritty"; # Use krunner (from kde) as our launcher menu = '' - fuzzel -f "Fira Sans" -b "103c48ff" -S "adbcbcff" -s "184956ff" -t "72898fff" -B 5 -r 5 -C "ed8649ff" + fuzzel -f "Iosevka Sans Quasi" -b "103c48ff" -S "adbcbcff" -s "184956ff" -t "72898fff" -B 5 -r 5 -C "ed8649ff" ''; # Use waybar, but through systemd bars = [ @@ -104,9 +104,9 @@ in with lib; { # command = "waybar"; # } ]; - # Use fira + # Use Iosevka fonts = { - names = [ "Fira Sans" ]; + names = [ "Iosevka Sans Quasi" ]; size = 10.0; }; # Selenize it @@ -194,8 +194,8 @@ in with lib; { textColor = "#adbcbc"; # Border configuration borderSize = 3; - # Use Fira Code for font - font = "Fira Sans 10"; + # Use Iosevka for font + font = "Iosevka Sans Quasi 10"; # Group by application groupBy = "app-name"; # Bottom right corner @@ -266,7 +266,7 @@ in with lib; { style = '' * { /* `otf-font-awesome` is required to be installed for icons */ - font-family: FontAwesome, Fira; + font-family: FontAwesome, Iosevka Sans Quasi; font-size: 14px; } diff --git a/modules/darwin/fonts.nix b/modules/darwin/fonts.nix index 5f010ff..4946e51 100644 --- a/modules/darwin/fonts.nix +++ b/modules/darwin/fonts.nix @@ -6,13 +6,23 @@ in with lib; { fonts.fonts = with pkgs; [ ## Monospace Fonts # FiraCode with nerd-fonts patch, as well as fira-code symbols for emacs - (nerdfonts.override { fonts = [ "FiraCode" ]; }) + (nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; }) fira-code-symbols fira # Proportional roboto liberation_ttf noto-fonts + (iosevka.override { + privateBuildPlan = '' + [buildPlans.iosevka-sans-quasi] + family = "Iosevka Sans Quasi" + spacing = "quasi-proportional" + serifs = "sans" + no-cv-ss = true + export-glyph-names = false''; + set = "sans-quasi"; + }) ]; }; } diff --git a/modules/linux/desktop.nix b/modules/linux/desktop.nix index 2313288..4950a42 100644 --- a/modules/linux/desktop.nix +++ b/modules/linux/desktop.nix @@ -65,13 +65,23 @@ in with lib; { fonts.fonts = with pkgs; [ ## Monospace Fonts # FiraCode with nerd-fonts patch, as well as fira-code symbols for emacs - (nerdfonts.override { fonts = [ "FiraCode" ]; }) + (nerdfonts.override { fonts = [ "FiraCode" "Iosevka" ]; }) fira-code-symbols fira - # Proportional + ## Proportional roboto liberation_ttf noto-fonts + (iosevka.override { + privateBuildPlan = '' + [buildPlans.iosevka-sans-quasi] + family = "Iosevka Sans Quasi" + spacing = "quasi-proportional" + serifs = "sans" + no-cv-ss = true + export-glyph-names = false''; + set = "sans-quasi"; + }) ]; }) ];