From d00fb4f7d19de1cc40ccc5846667b8ee27669ba0 Mon Sep 17 00:00:00 2001
From: sefidel <contact@sefidel.net>
Date: Mon, 24 Jan 2022 11:04:51 +0900
Subject: home/base: use cherry font

---
 home/profiles/base/config/dunst.nix        | 2 +-
 home/profiles/base/config/foot.nix         | 2 +-
 home/profiles/base/config/sway.nix         | 4 ++--
 home/profiles/base/config/waybar-style.nix | 2 +-
 home/profiles/base/default.nix             | 3 ++-
 home/profiles/fonts/default.nix            | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'home')

diff --git a/home/profiles/base/config/dunst.nix b/home/profiles/base/config/dunst.nix
index 07d520f..ac68827 100644
--- a/home/profiles/base/config/dunst.nix
+++ b/home/profiles/base/config/dunst.nix
@@ -19,7 +19,7 @@ with neotheme.colors;
     word_wrap = true;
     show_indicators = false;
     format = "<b>%s</b>\\n\\n%b";
-    font = "CtrlD 13";
+    font = "cherry 10";
     frame_color = "#${color3}";
     separator_color = "auto";
     max_icon_size = 80;
diff --git a/home/profiles/base/config/foot.nix b/home/profiles/base/config/foot.nix
index 3234efb..08efefd 100644
--- a/home/profiles/base/config/foot.nix
+++ b/home/profiles/base/config/foot.nix
@@ -5,7 +5,7 @@ with neotheme.colors;
 {
   main = {
     term = "foot";
-    font = "CtrlD:pixelsize=16,JetBrainsMono Nerd Font:size=9";
+    font = "cherry:pixelsize=13,JetBrainsMono Nerd Font:size=9";
     letter-spacing = 0;
     line-height = 13;
     dpi-aware = "yes";
diff --git a/home/profiles/base/config/sway.nix b/home/profiles/base/config/sway.nix
index d6d9ad7..744133d 100644
--- a/home/profiles/base/config/sway.nix
+++ b/home/profiles/base/config/sway.nix
@@ -20,7 +20,7 @@ with neotheme.colors;
   bindsym $mod+Return exec $term
 
   # set menu
-    set $menu "${pkgs.bemenu}/bin/bemenu-run -H 18 -l 5 --fn 'CtrlD Bold 16px' -p 'run::' --tb '$primary' --tf '$color0' --hb '$primary' --hf '$color0'"
+    set $menu "${pkgs.bemenu}/bin/bemenu-run -H 18 -l 5 --fn 'cherry 13px' -p 'run::' --tb '$primary' --tf '$color0' --hb '$primary' --hf '$color0'"
   bindsym $mod+d exec $menu
 
   # set screenshot util
@@ -63,7 +63,7 @@ with neotheme.colors;
   # kill focused
   bindsym $mod+w kill
 
-  font "pango:CtrlD 13"
+  font "pango:cherry 10"
 
   # window rules
   for_window [window_role="pop-up"]      floating enable
diff --git a/home/profiles/base/config/waybar-style.nix b/home/profiles/base/config/waybar-style.nix
index 6eed5de..b8c22d5 100644
--- a/home/profiles/base/config/waybar-style.nix
+++ b/home/profiles/base/config/waybar-style.nix
@@ -6,7 +6,7 @@ with neotheme.colors;
   * {
     border: none;
     border-radius: 0;
-    font-family: "CtrlD, JetBrainsMono Nerd Font";
+    font-family: "cherry, JetBrainsMono Nerd Font";
     font-size: 13px;
     min-height: 0;
   }
diff --git a/home/profiles/base/default.nix b/home/profiles/base/default.nix
index e49956d..6d6ff9c 100644
--- a/home/profiles/base/default.nix
+++ b/home/profiles/base/default.nix
@@ -29,7 +29,7 @@ in
     gtk.iconTheme.name = "Papirus-Dark";
     gtk.theme.package = phocus;
     gtk.theme.name = "phocus";
-    gtk.font.name = "CtrlD 13";
+    gtk.font.name = "cherry 10";
 
     home.file.".icons/default".source = "${pkgs.vanilla-dmz}/share/icons/Vanilla-DMZ-AA";
 
@@ -174,6 +174,7 @@ in
         settings = {
           default_mode = "normal";
           pane_frames = false;
+          simplified_ui = true; # bitmap fonts
 
           themes = {
             default = {
diff --git a/home/profiles/fonts/default.nix b/home/profiles/fonts/default.nix
index ab24f31..847cb7d 100644
--- a/home/profiles/fonts/default.nix
+++ b/home/profiles/fonts/default.nix
@@ -9,8 +9,9 @@ in
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
+      dina-font
       iosevka-pure-bin
-      ctrld-font
+      readable-cherry
       sarasa-gothic
       scientifica
       #siji # TODO: bitmap font conflict
-- 
cgit 1.4.1