From 4ada38d874fa4ab22661a1cf1baa1d0fffb58bf2 Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 14 Nov 2018 19:38:43 -0500
Subject: [PATCH] meta: Split kitty config into separate files

Since kitty.conf can include settings from other files, it is easy to
enforce sane kitty defaults without relying on pywal templates.
---
 bspwm/.config/wal/done.sh                     |  2 -
 .../.config/kitty}/kitty.conf                 | 52 ++-----------------
 kitty/.config/wal/templates/kitty             | 40 ++++++++++++++
 3 files changed, 44 insertions(+), 50 deletions(-)
 rename {bspwm/.config/wal/templates => kitty/.config/kitty}/kitty.conf (56%)
 create mode 100644 kitty/.config/wal/templates/kitty

diff --git a/bspwm/.config/wal/done.sh b/bspwm/.config/wal/done.sh
index d7a38bc..f812428 100755
--- a/bspwm/.config/wal/done.sh
+++ b/bspwm/.config/wal/done.sh
@@ -20,10 +20,8 @@ bspc config presel_feedback_color "$color1"
 
 mkdir -p  "${HOME}/.config/zathura"
 mkdir -p  "${HOME}/.config/dunst"
-mkdir -p  "${HOME}/.config/kitty"
 ln -sf    "${HOME}/.cache/wal/zathurarc"  "${HOME}/.config/zathura/zathurarc"
 ln -sf    "${HOME}/.cache/wal/dunstrc"    "${HOME}/.config/dunst/dunstrc"
-ln -sf    "${HOME}/.cache/wal/kitty.conf" "${HOME}/.config/kitty/kitty.conf"
 
 # ===================
 # ====== dunst ======
diff --git a/bspwm/.config/wal/templates/kitty.conf b/kitty/.config/kitty/kitty.conf
similarity index 56%
rename from bspwm/.config/wal/templates/kitty.conf
rename to kitty/.config/kitty/kitty.conf
index 174e000..814ceac 100644
--- a/bspwm/.config/wal/templates/kitty.conf
+++ b/kitty/.config/kitty/kitty.conf
@@ -1,6 +1,9 @@
 # New Start: A modern Arch workflow built with an emphasis on functionality.
 # Copyright (C) 2018 Donovan Glover
 
+# Use the colors generated by wal
+include ${HOME}/.cache/wal/kitty
+
 # =============================
 # ========== General ==========
 # =============================
@@ -12,7 +15,7 @@ shell fish
 font_family Hack
 
 # Font size (respects DPI)
-font_size 11.0
+font_size 11
 
 # Set the default background opacity to 1
 background_opacity 1.0
@@ -26,20 +29,12 @@ allow_remote_control yes
 # Don't limit frames per second to the monitor's refresh rate
 sync_to_monitor no
 
-# ==========================
-# ========== URLs ==========
-# ==========================
-
 # Use ctrl+click to open URLs
 open_url_modifiers ctrl
 
 # Open URLs with firefox
 open_url_with /usr/bin/firefox
 
-# ===============================
-# ========== Clipboard ==========
-# ===============================
-
 # Sometimes we forget whether copy/paste is ctrl+shift or ctrl+alt
 map ctrl+alt+c copy_to_clipboard
 map ctrl+alt+v paste_from_clipboard
@@ -60,43 +55,4 @@ window_padding_width 10.0
 # Make the tab bar margin the same as the window padding
 tab_bar_margin_width 10.0
 
-# ============================
-# ========== Colors ==========
-# ============================
-
-foreground            {foreground}
-background            {background}
-cursor                {cursor}
-
-selection_foreground  {background}
-selection_background  {foreground}
-
-active_border_color   {color3}
-inactive_border_color {color3}
-bell_border_color     {color3}
-
-color0  {color0}
-color1  {color1}
-color2  {color2}
-color3  {color3}
-color4  {color4}
-color5  {color5}
-color6  {color6}
-color7  {color7}
-color8  {color8}
-color9  {color9}
-color10 {color10}
-color11 {color11}
-color12 {color12}
-color13 {color13}
-color14 {color14}
-color15 {color15}
-
-active_tab_foreground   {color2}
-active_tab_background   {background}
-active_tab_font_style   normal
-
-inactive_tab_foreground {foreground}
-inactive_tab_background {background}
-
 # vim:ft=conf
diff --git a/kitty/.config/wal/templates/kitty b/kitty/.config/wal/templates/kitty
new file mode 100644
index 0000000..0f697d3
--- /dev/null
+++ b/kitty/.config/wal/templates/kitty
@@ -0,0 +1,40 @@
+# ============================
+# ========== Colors ==========
+# ============================
+
+foreground            {foreground}
+background            {background}
+cursor                {cursor}
+
+selection_foreground  {background}
+selection_background  {foreground}
+
+active_border_color   {color3}
+inactive_border_color {color3}
+bell_border_color     {color3}
+
+color0  {color0}
+color1  {color1}
+color2  {color2}
+color3  {color3}
+color4  {color4}
+color5  {color5}
+color6  {color6}
+color7  {color7}
+color8  {color8}
+color9  {color9}
+color10 {color10}
+color11 {color11}
+color12 {color12}
+color13 {color13}
+color14 {color14}
+color15 {color15}
+
+active_tab_foreground   {color2}
+active_tab_background   {background}
+active_tab_font_style   normal
+
+inactive_tab_foreground {foreground}
+inactive_tab_background {background}
+
+# vim:ft=conf