From 631472d06e4f0898290ebb447843d734c5561268 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Tue, 29 Aug 2023 18:02:02 +0900
Subject: [PATCH] Rearrange and change kitty fonts

---
 home-manager/common/software/cli/kitty.nix    | 75 +++----------------
 .../hyprland/gruvbox/waybar/waybar-conf.nix   |  4 +-
 2 files changed, 14 insertions(+), 65 deletions(-)

diff --git a/home-manager/common/software/cli/kitty.nix b/home-manager/common/software/cli/kitty.nix
index 8dc22538..58217167 100644
--- a/home-manager/common/software/cli/kitty.nix
+++ b/home-manager/common/software/cli/kitty.nix
@@ -1,12 +1,16 @@
 { config, pkgs, ... }: {
   # Kitty Conf
   # https://sw.kovidgoyal.net/kitty/conf/
+
+  # Theme
+  imports = [ ./gruvbox/kitty-theme.nix ];
+
   home.file.".config/kitty/kitty.conf".text = ''
   sync_to_monitor yes
   bell_on_tab "🔔 "
   window_alert_on_bell yes
   visual_bell_color none
-  command_on_bell none #TODO Update this to send a notification via mako / libnotify
+  command_on_bell none
 
   tab_bar_edge bottom
   tab_bar_style powerline
@@ -16,69 +20,14 @@
   tab_title_template "{fmt.fg.red}{bell_symbol}{activity_symbol}{fmt.fg.tab}{title}"
 
   allow_hyperlinks yes
+  disable_ligatures never
   shell_integration enabled
 
-  font_family      JetBrains Mono Regular 
-  # bold_font        JetBrains Mono Bold 
-  # italic_font      JetBrains Mono Italic 
-  # bold_italic_font JetBrains Bold Italic 
-  
+  font_family      JetBrains Mono Medium
+  bold_font        JetBrains Mono Bold
+  italic_font      JetBrains Mono Italic
+  bold_italic_font JetBrains Mono Bold Italic
+
   include ./theme.conf
   '';
-
-  # Kitty theme
-  # https://github.com/dexpota/kitty-themes/tree/master
-  home.file.".config/kitty/theme.conf".text = ''
-
-# gruvbox dark by morhetz, https://github.com/morhetz/gruvbox
-# This work is licensed under the terms of the MIT license.
-# For a copy, see https://opensource.org/licenses/MIT.
-
-background  #282828
-foreground  #ebdbb2
-
-cursor                #928374
-
-selection_foreground  #928374
-selection_background  #3c3836
-
-color0  #282828
-color8  #928374
-
-# red
-color1                #cc241d
-# light red
-color9                #fb4934
-
-# green
-color2                #98971a
-# light green
-color10               #b8bb26
-
-# yellow
-color3                #d79921
-# light yellow
-color11               #fabd2d
-
-# blue
-color4                #458588
-# light blue
-color12               #83a598
-
-# magenta
-color5                #b16286
-# light magenta
-color13               #d3869b
-
-# cyan
-color6                #689d6a
-# lighy cyan
-color14               #8ec07c
-
-# light gray
-color7                #a89984
-# dark gray
-color15               #928374
-
-  '';
-}
\ No newline at end of file
+}
diff --git a/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf.nix b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf.nix
index e43c9b01..250d548f 100644
--- a/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf.nix
+++ b/home-manager/hosts/nixos-laptop/desktops/hyprland/gruvbox/waybar/waybar-conf.nix
@@ -133,7 +133,7 @@
                 },
                 "format": "{icon}  {capacity}%",
                 "format-charging": "󰂄  {capacity}%",
-                "format-plugged": " {capacity}%",
+                "format-plugged": "  {capacity}%",
                 "format-icons": ["", "", "", "", ""]
             },
         }
@@ -238,4 +238,4 @@
       '';
     };
   };
-}
\ No newline at end of file
+}