From 02057ed4b7e56dda1961a47c13369ce3f025cc47 Mon Sep 17 00:00:00 2001
From: sloane <git@sloanelybutsurely.com>
Date: Fri, 1 Nov 2024 09:20:47 -0400
Subject: [PATCH] chore: merging

---
 .config/kitty/kitty.conf | 94 +++++-----------------------------------
 .config/tmux/tmux.conf   |  7 +--
 2 files changed, 12 insertions(+), 89 deletions(-)

diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 2754e15..28b1707 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,91 +1,17 @@
-# vim:ft=kitty
+font_family RecMonoCasual Nerd Font Mono
+font_size 16
 
-font_size         16.0
-font_family       RecMonoCasual Nerd Font Mono
-bold_font         auto
-italic_font       auto
-bold_italic_font  auto
+# include /nix/store/q0zlywm34vh76h9rl7v5wvxp57pfvrxc-kitty-themes-unstable-2023-12-28/share/kitty-themes/themes/Catppuccin-Mocha.conf
+
+# Shell integration is sourced and configured manually
+shell_integration no-rc
 
 confirm_os_window_close 0
 paste_actions quote-urls-at-prompt,confirm-if-large
 
 
 
-## name:     Catppuccin Kitty Mocha
-## author:   Catppuccin Org
-## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/themes/mocha.conf
-## blurb:    Soothing pastel theme for the high-spirited!
-
-
-
-# The basic colors
-foreground              #cdd6f4
-background              #1e1e2e
-selection_foreground    #1e1e2e
-selection_background    #f5e0dc
-
-# Cursor colors
-cursor                  #f5e0dc
-cursor_text_color       #1e1e2e
-
-# URL underline color when hovering with mouse
-url_color               #f5e0dc
-
-# Kitty window border colors
-active_border_color     #b4befe
-inactive_border_color   #6c7086
-bell_border_color       #f9e2af
-
-# OS Window titlebar colors
-wayland_titlebar_color system
-macos_titlebar_color system
-
-# Tab bar colors
-active_tab_foreground   #11111b
-active_tab_background   #cba6f7
-inactive_tab_foreground #cdd6f4
-inactive_tab_background #181825
-tab_bar_background      #11111b
-
-# Colors for marks (marked text in the terminal)
-mark1_foreground #1e1e2e
-mark1_background #b4befe
-mark2_foreground #1e1e2e
-mark2_background #cba6f7
-mark3_foreground #1e1e2e
-mark3_background #74c7ec
-
-# The 16 terminal colors
-
-# black
-color0 #45475a
-color8 #585b70
-
-# red
-color1 #f38ba8
-color9 #f38ba8
-
-# green
-color2  #a6e3a1
-color10 #a6e3a1
-
-# yellow
-color3  #f9e2af
-color11 #f9e2af
-
-# blue
-color4  #89b4fa
-color12 #89b4fa
-
-# magenta
-color5  #f5c2e7
-color13 #f5c2e7
-
-# cyan
-color6  #94e2d5
-color14 #94e2d5
-
-# white
-color7  #bac2de
-color15 #a6adc8
+# BEGIN_KITTY_THEME
+# Catppuccin-Latte
+include current-theme.conf
+# END_KITTY_THEME
\ No newline at end of file
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 66816bf..85ab9e1 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -2,18 +2,15 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 set -g @plugin 'christoomey/vim-tmux-navigator'
-set -g @plugin 'catppuccin/tmux#latest'
+set -g @plugin 'catppuccin/tmux#v2.1.0'
 
-set -g @catppuccin_flavor 'mocha'
+set -g @catppuccin_flavor 'latte'
 
 unbind C-b
 set-option -g prefix C-a
 bind-key C-a send-prefix
 setw -g mode-keys vi
 
-set-option -g allow-rename off
-
-# Set new panes to open in current directory
 bind c new-window -c "#{pane_current_path}"
 bind '"' split-window -c "#{pane_current_path}"
 bind % split-window -h -c "#{pane_current_path}"