From fc154887f29bc14b4315e5ab1c15aeac046bdb57 Mon Sep 17 00:00:00 2001
From: kat witch <kat@kittywit.ch>
Date: Fri, 12 Feb 2021 15:57:52 +0000
Subject: [PATCH] Unified font sizes.

Should really move to templating config.el so that I can shove the font
definition in that way.
---
 config/users/kat/doom.d/config.el |  2 +-
 config/users/kat/style.nix        |  2 +-
 config/users/kat/sway.nix         | 22 +---------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/config/users/kat/doom.d/config.el b/config/users/kat/doom.d/config.el
index a3e89666..9c9a0db8 100644
--- a/config/users/kat/doom.d/config.el
+++ b/config/users/kat/doom.d/config.el
@@ -19,7 +19,7 @@
 ;;
 ;; They all accept either a font-spec, font string ("Input Mono-12"), or xlfd
 ;; font string. You generally only need these two:
-(setq doom-font (font-spec :family "Hack Nerd Font" :size 13))
+(setq doom-font (font-spec :family "Hack Nerd Font" :size 12))
 ;;       doom-variable-pitch-font (font-spec :family "sans" :size 13))
 
 ;; There are two ways to load a theme. Both assume the theme is installed and
diff --git a/config/users/kat/style.nix b/config/users/kat/style.nix
index bc836792..aedaa37b 100644
--- a/config/users/kat/style.nix
+++ b/config/users/kat/style.nix
@@ -28,7 +28,7 @@ rec {
 
   font = {
     name = "Hack Nerd Font";
-    size = "10";
+    size = "9";
     size_css = "12px";
   };
 }
diff --git a/config/users/kat/sway.nix b/config/users/kat/sway.nix
index fd6666d2..ef63b723 100644
--- a/config/users/kat/sway.nix
+++ b/config/users/kat/sway.nix
@@ -22,26 +22,6 @@ in {
     };
 
     home-manager.users.kat = {
-      programs.kitty = {
-        enable = true;
-        font.name = style.font.name;
-        settings = {
-          font_size = style.font.size;
-          background = style.base16.color0;
-          background_opacity = "0.7";
-          foreground = style.base16.color7;
-          selection_background = style.base16.color7;
-          selection_foreground = style.base16.color0;
-          url_color = style.base16.color3;
-          cursor = style.base16.color7;
-          active_border_color = "#75715e";
-          active_tab_background = "#9900ff";
-          active_tab_foreground = style.base16.color7;
-          inactive_tab_background = "#3a3a3a";
-          inactive_tab_foreground = "#665577";
-        } // style.base16;
-      };
-
       programs.mako = {
         enable = true;
         defaultTimeout = 3000;
@@ -54,7 +34,7 @@ in {
         enable = true;
         config = let
           dmenu =
-            "${pkgs.bemenu}/bin/bemenu --fn 'Iosevka 12' --nb '${style.base16.color0}' --nf '${style.base16.color7}' --sb '${style.base16.color1}' --sf '${style.base16.color7}' -l 5 -m -1 -i";
+            "${pkgs.bemenu}/bin/bemenu --fn '${style.font.name} ${style.font.size}' --nb '${style.base16.color0}' --nf '${style.base16.color7}' --sb '${style.base16.color1}' --sf '${style.base16.color7}' -l 5 -m -1 -i";
           lockCommand = "swaylock -i ${./wallpapers/main.jpg} -s fill";
           cfg = config.home-manager.users.kat.wayland.windowManager.sway.config;
         in {