From 9e0625e7917d6282fe2fb12b9673a91a839bb047 Mon Sep 17 00:00:00 2001
From: Pocco81 <pocco451@gmail.com>
Date: Fri, 5 Nov 2021 20:18:47 -0500
Subject: [PATCH] feat: Catppuccin for tmux!

---
 extra/tmux/.tmux.conf                         |  2 +-
 .../tmux/{neon_latte.conf => catppuccin.conf} | 50 +++++--------
 extra/tmux/dark_catppuccino.conf              | 70 -------------------
 extra/tmux/light_melya.conf                   | 70 -------------------
 extra/tmux/soft_manilo.conf                   | 70 -------------------
 5 files changed, 19 insertions(+), 243 deletions(-)
 rename extra/tmux/{neon_latte.conf => catppuccin.conf} (53%)
 delete mode 100644 extra/tmux/dark_catppuccino.conf
 delete mode 100644 extra/tmux/light_melya.conf
 delete mode 100644 extra/tmux/soft_manilo.conf

diff --git a/extra/tmux/.tmux.conf b/extra/tmux/.tmux.conf
index 65c27d2..8f84e42 100644
--- a/extra/tmux/.tmux.conf
+++ b/extra/tmux/.tmux.conf
@@ -1,4 +1,4 @@
-# these are general settings for Tmux unrelated to Catppuccino
+# these are general settings for Tmux unrelated to Catppuccin
 # Dependencies:
 #	+ xclip
 
diff --git a/extra/tmux/neon_latte.conf b/extra/tmux/catppuccin.conf
similarity index 53%
rename from extra/tmux/neon_latte.conf
rename to extra/tmux/catppuccin.conf
index 53a91f2..f3699b0 100644
--- a/extra/tmux/neon_latte.conf
+++ b/extra/tmux/catppuccin.conf
@@ -1,33 +1,19 @@
-# ----------------------------=== Colorscheme ===--------------------------
-
 # NOTE: you can use vars with $<var> and ${<var>} as long as the str is double quoted: ""
 # WARNING: hex colors can't contain capital letters
 
-# --> Neon Latte
-thm_bg="#150b26"
-thm_fg="#fdebc3"
-thm_fg_gutter="#3b4261"
-thm_black="#393b44"
-thm_gray="#2a2e36"
-thm_red="#cf4f6d"
-thm_green="#51ee72"
-thm_yellow="#ffe070"
-thm_blue="#96e2f0"
-thm_magenta="#d97bf2"
-thm_cyan="#63cdcf"
-thm_white="#dfdfe0"
-thm_orange="#edc580"
-thm_pink="#d67ad2"
-thm_black_br="#7f8c98"
-thm_red_br="#e06c75"
-thm_green_br="#58cd8b"
-thm_yellow_br="#ffe37e"
-thm_blue_br="#84cee4"
-thm_magenta_br="#b8a1e3"
-thm_cyan_br="#59f0ff"
-thm_white_br="#fdebc3"
-thm_orange_br="#f6a878"
-thm_pink_br="#df97db"
+# --> Catppuccin (some colors)
+thm_bg="#1b1624"
+thm_fg="#B9C4E3"
+thm_white="#f0f0f5"
+thm_black="#0E0C13"
+thm_gray="#312C44"
+thm_magenta="#ae9ad6"
+thm_pink="#f0a8e4"
+thm_red="#e28d8d"
+thm_green="#add692"
+thm_yellow="#f0dc89"
+thm_blue="#84a5cb"
+thm_orange="#e7a988"
 
 # ----------------------------=== Theme ===--------------------------
 
@@ -40,12 +26,12 @@ set -g status-left-length "100"
 set -g status-right-length "100"
 
 # messages
-set -g message-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-set -g message-command-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
+set -g message-style fg="${thm_white}",bg="${thm_gray}",align="centre"
+set -g message-command-style fg="${thm_white}",bg="${thm_gray}",align="centre"
 
 # panes
 set -g pane-border-style fg="${thm_gray}"
-set -g pane-active-border-style fg="${thm_blue_br}"
+set -g pane-active-border-style fg="${thm_blue}"
 
 # windows
 setw -g window-status-activity-style fg="${thm_fg}",bg="${thm_bg}",none
@@ -55,11 +41,11 @@ setw -g window-status-style fg="${thm_fg}",bg="${thm_bg}",none
 # --------=== Statusline
 
 set -g status-left ""
-set -g status-right "#[fg=$thm_magenta,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_magenta,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green_br]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green_br]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S "
+set -g status-right "#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S "
 
 # current_dir
 setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} "
-setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_white_br,bg=$thm_bg] #{b:pane_current_path} "
+setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_white,bg=$thm_bg] #{b:pane_current_path} "
 
 # parent_dir/current_dir
 # setw -g window-status-format "#[fg=colour232,bg=colour111] #I #[fg=colour222,bg=colour235] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
diff --git a/extra/tmux/dark_catppuccino.conf b/extra/tmux/dark_catppuccino.conf
deleted file mode 100644
index 85dce7d..0000000
--- a/extra/tmux/dark_catppuccino.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# ----------------------------=== Colorscheme ===--------------------------
-
-# NOTE: you can use vars with $<var> and ${<var>} as long as the str is double quoted: ""
-# WARNING: hex colors can't contain capital letters
-
-# --> Dark Catppuccino
-thm_bg="#0e171c"
-thm_fg="#abb2bf"
-thm_fg_gutter="#3b4261"
-thm_black="#393b44"
-thm_gray="#2a2e36"
-thm_red="#c94f6d"
-thm_green="#97c374"
-thm_yellow="#dbc074"
-thm_blue="#61afef"
-thm_magenta="#c678dd"
-thm_cyan="#63cdcf"
-thm_white="#dfdfe0"
-thm_orange="#f4a261"
-thm_pink="#d67ad2"
-thm_black_br="#7f8c98"
-thm_red_br="#e06c75"
-thm_green_br="#58cd8b"
-thm_yellow_br="#ffe37e"
-thm_blue_br="#84cee4"
-thm_magenta_br="#b8a1e3"
-thm_cyan_br="#59f0ff"
-thm_white_br="#fdebc3"
-thm_orange_br="#f6a878"
-thm_pink_br="#df97db"
-
-# ----------------------------=== Theme ===--------------------------
-
-# status
-set -g status-position top
-set -g status "on"
-set -g status-bg "${thm_bg}"
-set -g status-justify "left"
-set -g status-left-length "100"
-set -g status-right-length "100"
-
-# messages
-set -g message-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-set -g message-command-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-
-# panes
-set -g pane-border-style fg="${thm_gray}"
-set -g pane-active-border-style fg="${thm_blue_br}"
-
-# windows
-setw -g window-status-activity-style fg="${thm_fg}",bg="${thm_bg}",none
-setw -g window-status-separator ""
-setw -g window-status-style fg="${thm_fg}",bg="${thm_bg}",none
-
-# --------=== Statusline
-
-set -g status-left ""
-set -g status-right "#[fg=$thm_magenta,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_magenta,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green_br]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green_br]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S "
-
-# current_dir
-setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} "
-setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_white_br,bg=$thm_bg] #{b:pane_current_path} "
-
-# parent_dir/current_dir
-# setw -g window-status-format "#[fg=colour232,bg=colour111] #I #[fg=colour222,bg=colour235] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
-# setw -g window-status-current-format "#[fg=colour232,bg=colour208] #I #[fg=colour255,bg=colour237] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
-
-# --------=== Modes
-setw -g clock-mode-colour "${thm_blue}"
-setw -g mode-style "fg=${thm_yellow} bg=${thm_bg} bold"
diff --git a/extra/tmux/light_melya.conf b/extra/tmux/light_melya.conf
deleted file mode 100644
index a63c1a9..0000000
--- a/extra/tmux/light_melya.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# ----------------------------=== Colorscheme ===--------------------------
-
-# NOTE: you can use vars with $<var> and ${<var>} as long as the str is double quoted: ""
-# WARNING: hex colors can't contain capital letters
-
-# --> Neon Latte
-thm_bg="#fbfbfb"
-thm_fg="#0e171c"
-thm_fg_gutter="#3b4261"
-thm_black="#393b44"
-thm_gray="#2a2e36"
-thm_red="#b0304e"
-thm_green="#76ab49"
-thm_yellow="#ffce1f"
-thm_blue="#157c8e"
-thm_magenta="#a414cc"
-thm_cyan="#4a9596"
-thm_white="#dfdfe0"
-thm_orange="#f4a261"
-thm_pink="#d67ad2"
-thm_black_br="#7f8c98"
-thm_red_br="#d84652"
-thm_green_br="#58cd8b"
-thm_yellow_br="#ffca0a"
-thm_blue_br="#84cee4"
-thm_magenta_br="#b8a1e3"
-thm_cyan_br="#63cdcf"
-thm_white_br="#eaeaeb"
-thm_orange_br="#f3843f"
-thm_pink_br="#df97db"
-
-# ----------------------------=== Theme ===--------------------------
-
-# status
-set -g status-position top
-set -g status "on"
-set -g status-bg "${thm_bg}"
-set -g status-justify "left"
-set -g status-left-length "100"
-set -g status-right-length "100"
-
-# messages
-set -g message-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-set -g message-command-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-
-# panes
-set -g pane-border-style fg="${thm_gray}"
-set -g pane-active-border-style fg="${thm_blue_br}"
-
-# windows
-setw -g window-status-activity-style fg="${thm_fg}",bg="${thm_bg}",none
-setw -g window-status-separator ""
-setw -g window-status-style fg="${thm_fg}",bg="${thm_bg}",none
-
-# --------=== Statusline
-
-set -g status-left ""
-set -g status-right "#[fg=$thm_magenta,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_magenta,nobold,nounderscore,noitalics] #[fg=$thm_white,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green_br]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green_br]}#[fg=$thm_bg] #[fg=$thm_white,bg=$thm_gray] #S "
-
-# current_dir
-setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_white,bg=$thm_gray] #{b:pane_current_path} "
-setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_gray,bg=$thm_bg] #{b:pane_current_path} "
-
-# parent_dir/current_dir
-# setw -g window-status-format "#[fg=colour232,bg=colour111] #I #[fg=colour222,bg=colour235] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
-# setw -g window-status-current-format "#[fg=colour232,bg=colour208] #I #[fg=colour255,bg=colour237] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
-
-# --------=== Modes
-setw -g clock-mode-colour "${thm_blue}"
-setw -g mode-style "fg=${thm_yellow} bg=${thm_bg} bold"
diff --git a/extra/tmux/soft_manilo.conf b/extra/tmux/soft_manilo.conf
deleted file mode 100644
index 13fcc11..0000000
--- a/extra/tmux/soft_manilo.conf
+++ /dev/null
@@ -1,70 +0,0 @@
-# ----------------------------=== Colorscheme ===--------------------------
-
-# NOTE: you can use vars with $<var> and ${<var>} as long as the str is double quoted: ""
-# WARNING: hex colors can't contain capital letters
-
-# --> Soft Manilo
-thm_bg="#222424"
-thm_fg="#b9bfcA"
-thm_fg_gutter="#3b415c"
-thm_black="#393b44"
-thm_gray="#353B45"
-thm_red="#cf637e"
-thm_green="#aacE8d"
-thm_yellow="#dbc074"
-thm_blue="#90c7f4"
-thm_magenta="#d59ee6"
-thm_cyan="#73d2d4"
-thm_white="#dfdfe0"
-thm_orange="#f4a261"
-thm_pink="#d67ad2"
-thm_black_br="#7f8c98"
-thm_red_br="#e68991"
-thm_green_br="#95c270"
-thm_yellow_br="#ffe37e"
-thm_blue_br="#84cee4"
-thm_magenta_br="#b8a1e3"
-thm_cyan_br="#70f3ff"
-thm_white_br="#fedbc3"
-thm_orange_br="#f8b58c"
-thm_pink_br="#df97db"
-
-# ----------------------------=== Theme ===--------------------------
-
-# status
-set -g status-position top
-set -g status "on"
-set -g status-bg "${thm_bg}"
-set -g status-justify "left"
-set -g status-left-length "100"
-set -g status-right-length "100"
-
-# messages
-set -g message-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-set -g message-command-style fg="${thm_white_br}",bg="${thm_gray}",align="centre"
-
-# panes
-set -g pane-border-style fg="${thm_gray}"
-set -g pane-active-border-style fg="${thm_blue_br}"
-
-# windows
-setw -g window-status-activity-style fg="${thm_fg}",bg="${thm_bg}",none
-setw -g window-status-separator ""
-setw -g window-status-style fg="${thm_fg}",bg="${thm_bg}",none
-
-# --------=== Statusline
-
-set -g status-left ""
-set -g status-right "#[fg=$thm_magenta,bg=$thm_bg,nobold,nounderscore,noitalics]#[fg=$thm_bg,bg=$thm_magenta,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red],#[fg=$thm_green_br]}#[bg=$thm_gray]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green_br]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S "
-
-# current_dir
-setw -g window-status-format "#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} "
-setw -g window-status-current-format "#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_white_br,bg=$thm_bg] #{b:pane_current_path} "
-
-# parent_dir/current_dir
-# setw -g window-status-format "#[fg=colour232,bg=colour111] #I #[fg=colour222,bg=colour235] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
-# setw -g window-status-current-format "#[fg=colour232,bg=colour208] #I #[fg=colour255,bg=colour237] #(echo "#{pane_current_path}" | rev | cut -d'/' -f-2 | rev) "
-
-# --------=== Modes
-setw -g clock-mode-colour "${thm_blue}"
-setw -g mode-style "fg=${thm_yellow} bg=${thm_bg} bold"