From 59121924e6f18de1b2a16f90128e56397a475781 Mon Sep 17 00:00:00 2001
From: sloane <git@sloanelybutsurely.com>
Date: Sun, 10 Nov 2024 16:14:42 -0500
Subject: [PATCH] switch up colorschemes

---
 .config/kitty/current-theme.conf         | 78 ++++++++++++------------
 .config/kitty/kitty.conf                 |  7 +--
 .config/nvim/lua/plugins/colorscheme.lua | 15 ++++-
 .config/tmux/tmux.conf                   |  2 +-
 4 files changed, 55 insertions(+), 47 deletions(-)

diff --git a/.config/kitty/current-theme.conf b/.config/kitty/current-theme.conf
index 2533db7..80c3a35 100644
--- a/.config/kitty/current-theme.conf
+++ b/.config/kitty/current-theme.conf
@@ -1,80 +1,80 @@
 # vim:ft=kitty
 
-## name:     Catppuccin-Mocha
+## name:     Catppuccin-Frappe
 ## author:   Pocco81 (https://github.com/Pocco81)
 ## license:  MIT
-## upstream: https://github.com/catppuccin/kitty/blob/main/mocha.conf
+## upstream: https://github.com/catppuccin/kitty/blob/main/frappe.conf
 ## blurb:    Soothing pastel theme for the high-spirited!
 
 
 
 # The basic colors
-foreground              #CDD6F4
-background              #1E1E2E
-selection_foreground    #1E1E2E
-selection_background    #F5E0DC
+foreground              #C6D0F5
+background              #303446
+selection_foreground    #303446
+selection_background    #F2D5CF
 
 # Cursor colors
-cursor                  #F5E0DC
-cursor_text_color       #1E1E2E
+cursor                  #F2D5CF
+cursor_text_color       #303446
 
 # URL underline color when hovering with mouse
-url_color               #F5E0DC
+url_color               #F2D5CF
 
 # Kitty window border colors
-active_border_color     #B4BEFE
-inactive_border_color   #6C7086
-bell_border_color       #F9E2AF
+active_border_color     #BABBF1
+inactive_border_color   #737994
+bell_border_color       #E5C890
 
 # 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
+active_tab_foreground   #232634
+active_tab_background   #CA9EE6
+inactive_tab_foreground #C6D0F5
+inactive_tab_background #292C3C
+tab_bar_background      #232634
 
 # 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
+mark1_foreground #303446
+mark1_background #BABBF1
+mark2_foreground #303446
+mark2_background #CA9EE6
+mark3_foreground #303446
+mark3_background #85C1DC
 
 # The 16 terminal colors
 
 # black
-color0 #45475A
-color8 #585B70
+color0 #51576D
+color8 #626880
 
 # red
-color1 #F38BA8
-color9 #F38BA8
+color1 #E78284
+color9 #E78284
 
 # green
-color2  #A6E3A1
-color10 #A6E3A1
+color2  #A6D189
+color10 #A6D189
 
 # yellow
-color3  #F9E2AF
-color11 #F9E2AF
+color3  #E5C890
+color11 #E5C890
 
 # blue
-color4  #89B4FA
-color12 #89B4FA
+color4  #8CAAEE
+color12 #8CAAEE
 
 # magenta
-color5  #F5C2E7
-color13 #F5C2E7
+color5  #F4B8E4
+color13 #F4B8E4
 
 # cyan
-color6  #94E2D5
-color14 #94E2D5
+color6  #81C8BE
+color14 #81C8BE
 
 # white
-color7  #BAC2DE
-color15 #A6ADC8
+color7  #B5BFE2
+color15 #A5ADCE
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 33acf49..00927eb 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -1,7 +1,6 @@
-font_family RecMonoCasual Nerd Font Mono
-font_size 16
+font_family Courier Prime
+font_size 18
 
-# 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
@@ -12,6 +11,6 @@ paste_actions quote-urls-at-prompt,confirm-if-large
 macos_option_as_alt yes
 
 # BEGIN_KITTY_THEME
-# Catppuccin-Mocha
+# Catppuccin-Frappe
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index 35397c8..e6c91e9 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,10 +1,19 @@
 return {
+  -- {
+  --   'foxoman/vim-helix',
+  --   lazy = false,
+  --   priority = 1000,
+  --   config = function ()
+  --     vim.cmd([[colorscheme helix-boo]])
+  --   end,
+  -- },
   {
-    'foxoman/vim-helix',
+    'catppuccin/nvim',
+    name = 'catppuccin',
     lazy = false,
     priority = 1000,
     config = function ()
-      vim.cmd([[colorscheme helix-boo]])
-    end,
+      vim.cmd([[colorscheme catppuccin-latte]])
+    end
   },
 }
diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf
index 3e537aa..a8b2b72 100644
--- a/.config/tmux/tmux.conf
+++ b/.config/tmux/tmux.conf
@@ -4,7 +4,7 @@ set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 set -g @plugin 'christoomey/vim-tmux-navigator'
 set -g @plugin 'catppuccin/tmux#v2.1.0'
 
-set -g @catppuccin_flavor 'mocha'
+set -g @catppuccin_flavor 'frappe'
 
 unbind C-b
 set-option -g prefix C-a