From 607669b21ea474cdce4982eb578283c3f6c1363b Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Sun, 20 Jun 2021 03:11:29 +0100
Subject: [PATCH] project-wide: Move from FantasqueSansMono to Iosevka

---
 profiles/gui/fonts.nix            | 1 -
 users/kat/gui/kitty.nix           | 2 +-
 users/kat/gui/wezterm.nix         | 5 ++---
 users/kat/sway/mako.nix           | 2 +-
 users/kat/sway/sway.nix           | 6 +++---
 users/kat/sway/waybar/default.nix | 4 ++--
 6 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/profiles/gui/fonts.nix b/profiles/gui/fonts.nix
index cb698f49..fe01380b 100644
--- a/profiles/gui/fonts.nix
+++ b/profiles/gui/fonts.nix
@@ -12,7 +12,6 @@
   fonts.fonts = with pkgs; [
     font-awesome
     nerdfonts
-    iosevka
     emacs-all-the-icons-fonts
     twitter-color-emoji
   ];
diff --git a/users/kat/gui/kitty.nix b/users/kat/gui/kitty.nix
index 5ddad2ca..db87ef99 100644
--- a/users/kat/gui/kitty.nix
+++ b/users/kat/gui/kitty.nix
@@ -4,7 +4,7 @@ let
   witch.style.base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
   witch.style.font = {
-    name = "FantasqueSansMono Nerd Font";
+    name = "Iosevka Nerd Font";
     size = "10";
     size_css = "14px";
   };
diff --git a/users/kat/gui/wezterm.nix b/users/kat/gui/wezterm.nix
index cf669331..a9a8bfca 100644
--- a/users/kat/gui/wezterm.nix
+++ b/users/kat/gui/wezterm.nix
@@ -16,10 +16,9 @@ in {
     local wezterm = require 'wezterm';
 
     return {
-      enable_wayland = true,
       term = "wezterm",
-      font = wezterm.font_with_fallback({"FantasqueSansMono Nerd Font","Twitter Color Emoji"}),
-      font_size = 10.0,
+      font = wezterm.font_with_fallback({"Iosevka Term","Twitter Color Emoji"}),
+      font_size = 9.0,
       window_background_opacity = 0.9,
       colors = {
         ansi = {${colors.ansi}},
diff --git a/users/kat/sway/mako.nix b/users/kat/sway/mako.nix
index 079f53b4..2b3a6204 100644
--- a/users/kat/sway/mako.nix
+++ b/users/kat/sway/mako.nix
@@ -4,7 +4,7 @@ let
   base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
   font = {
-    name = "FantasqueSansMono Nerd Font";
+    name = "Iosevka Nerd Font";
     size = "10";
     size_css = "14px";
   };
diff --git a/users/kat/sway/sway.nix b/users/kat/sway/sway.nix
index a7145388..06d69f94 100644
--- a/users/kat/sway/sway.nix
+++ b/users/kat/sway/sway.nix
@@ -4,8 +4,8 @@ let
   base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
   font = {
-    name = "FantasqueSansMono Nerd Font";
-    size = 10.0;
+    name = "Iosevka";
+    size = 9.0;
     size_css = "14px";
   };
 in
@@ -94,7 +94,7 @@ in
 
           fonts = { 
             names = [ font.name ];
-            style = "Normal";
+            style = "Medium";
             size = font.size;
           };
           terminal = "${pkgs.wezterm}/bin/wezterm";
diff --git a/users/kat/sway/waybar/default.nix b/users/kat/sway/waybar/default.nix
index 79ea9643..57adeba4 100644
--- a/users/kat/sway/waybar/default.nix
+++ b/users/kat/sway/waybar/default.nix
@@ -4,9 +4,9 @@ let
   base16 = lib.mapAttrs' (k: v: lib.nameValuePair k "#${v.hex.rgb}")
     config.lib.arc.base16.schemeForAlias.default;
   font = {
-    name = "FantasqueSansMono Nerd Font";
+    name = "Iosevka Nerd Font";
     size = "10";
-    size_css = "14px";
+    size_css = "12px";
   };
 in
 {