From 2e6b97616f8ee20b7d056ef58d89666fc32ddafb Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Mon, 1 May 2023 21:04:03 -0400 Subject: [PATCH 01/10] changing icon --- catppuccin.tmux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index 72ce019..b56c323 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -64,11 +64,11 @@ main() { local wt_enabled wt_enabled="$(get_tmux_option "@catppuccin_window_tabs_enabled" "off")" readonly wt_enabled - + local right_separator right_separator="$(get_tmux_option "@catppuccin_right_separator" "")" readonly right_separator - + local left_separator left_separator="$(get_tmux_option "@catppuccin_left_separator" "")" readonly left_separator @@ -114,7 +114,7 @@ main() { readonly show_host="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󰒋 #[fg=$thm_fg,bg=$thm_gray] #H " local show_date_time - readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue] #[fg=$thm_fg,bg=$thm_gray] $date_time " + readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󰚭 #[fg=$thm_fg,bg=$thm_gray] $date_time " # Right column 1 by default shows the Window name. local right_column1=$show_window From 33f8fb6eb6d5de5c8637aa8510df3b1eeb9a9355 Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Mon, 1 May 2023 21:09:34 -0400 Subject: [PATCH 02/10] icon switch --- catppuccin.tmux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index b56c323..b0f3f43 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -114,7 +114,7 @@ main() { readonly show_host="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󰒋 #[fg=$thm_fg,bg=$thm_gray] #H " local show_date_time - readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󰚭 #[fg=$thm_fg,bg=$thm_gray] $date_time " + readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󱑒 #[fg=$thm_fg,bg=$thm_gray] $date_time " # Right column 1 by default shows the Window name. local right_column1=$show_window From d9d260525371c81d265a6a15468cd90384960c8c Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Wed, 3 May 2023 20:45:12 -0400 Subject: [PATCH 03/10] setting --- catppuccin.tmux | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index b0f3f43..de68f7c 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -77,14 +77,23 @@ main() { user="$(get_tmux_option "@catppuccin_user" "off")" readonly user + local user_icon + user_icon="$(get_tmux_option "@catppuccin_user_icon", "")" + local host host="$(get_tmux_option "@catppuccin_host" "off")" readonly host + local host_icon + host_icon="$(get_tmux_option "@catppuccin_host_icon", "󰒋")" + local date_time date_time="$(get_tmux_option "@catppuccin_date_time" "off")" readonly date_time + local datetime_icon + datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "󰒋")" + # These variables are the defaults so that the setw and set calls are easier to parse. local show_directory readonly show_directory="#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]$right_separator#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} #{?client_prefix,#[fg=$thm_red]" @@ -108,13 +117,13 @@ main() { readonly show_window_in_window_status_current="#[fg=$thm_fg,bg=$thm_gray] #W #[fg=$thm_bg,bg=$thm_orange] #I#[fg=$thm_orange,bg=$thm_bg]$left_separator#[fg=$thm_fg,bg=$thm_bg,nobold,nounderscore,noitalics] " local show_user - readonly show_user="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue] #[fg=$thm_fg,bg=$thm_gray] #(whoami) " + readonly show_user="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]${user_icon} #[fg=$thm_fg,bg=$thm_gray] #(whoami) " local show_host - readonly show_host="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󰒋 #[fg=$thm_fg,bg=$thm_gray] #H " + readonly show_host="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]${host_icon} #[fg=$thm_fg,bg=$thm_gray] #H " local show_date_time - readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]󱑒 #[fg=$thm_fg,bg=$thm_gray] $date_time " + readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]${datetime_icon} #[fg=$thm_fg,bg=$thm_gray] $date_time " # Right column 1 by default shows the Window name. local right_column1=$show_window From a7cd4c69e55e69faa1699416beb94dfc095a95e5 Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Wed, 3 May 2023 20:51:08 -0400 Subject: [PATCH 04/10] trying again --- catppuccin.tmux | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index de68f7c..34ed8b9 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -92,7 +92,7 @@ main() { readonly date_time local datetime_icon - datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "󰒋")" + datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "")" # These variables are the defaults so that the setw and set calls are easier to parse. local show_directory @@ -117,13 +117,13 @@ main() { readonly show_window_in_window_status_current="#[fg=$thm_fg,bg=$thm_gray] #W #[fg=$thm_bg,bg=$thm_orange] #I#[fg=$thm_orange,bg=$thm_bg]$left_separator#[fg=$thm_fg,bg=$thm_bg,nobold,nounderscore,noitalics] " local show_user - readonly show_user="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]${user_icon} #[fg=$thm_fg,bg=$thm_gray] #(whoami) " + readonly show_user="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]$user_icon #[fg=$thm_fg,bg=$thm_gray] #(whoami) " local show_host - readonly show_host="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]${host_icon} #[fg=$thm_fg,bg=$thm_gray] #H " + readonly show_host="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]$host_icon #[fg=$thm_fg,bg=$thm_gray] #H " local show_date_time - readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]${datetime_icon} #[fg=$thm_fg,bg=$thm_gray] $date_time " + readonly show_date_time="#[fg=$thm_blue,bg=$thm_gray]$right_separator#[fg=$thm_bg,bg=$thm_blue]$datetime_icon #[fg=$thm_fg,bg=$thm_gray] $date_time " # Right column 1 by default shows the Window name. local right_column1=$show_window From 00f54dfbaf46e633436ec6cdbc5431e060502be4 Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Wed, 3 May 2023 20:54:34 -0400 Subject: [PATCH 05/10] debugging --- catppuccin.tmux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index 34ed8b9..c5aefa8 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -92,7 +92,7 @@ main() { readonly date_time local datetime_icon - datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "")" + datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "HELLO")" # These variables are the defaults so that the setw and set calls are easier to parse. local show_directory From 75d0716671bc66b1b9a505824d68d77a3cec3394 Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Wed, 3 May 2023 21:00:50 -0400 Subject: [PATCH 06/10] another try --- catppuccin.tmux | 3 +++ 1 file changed, 3 insertions(+) diff --git a/catppuccin.tmux b/catppuccin.tmux index c5aefa8..b36e956 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -79,6 +79,7 @@ main() { local user_icon user_icon="$(get_tmux_option "@catppuccin_user_icon", "")" + readonly user_icon local host host="$(get_tmux_option "@catppuccin_host" "off")" @@ -86,6 +87,7 @@ main() { local host_icon host_icon="$(get_tmux_option "@catppuccin_host_icon", "󰒋")" + readonly host_icon local date_time date_time="$(get_tmux_option "@catppuccin_date_time" "off")" @@ -93,6 +95,7 @@ main() { local datetime_icon datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "HELLO")" + readonly datetime_icon # These variables are the defaults so that the setw and set calls are easier to parse. local show_directory From 1ddf3217a56b501f86ed16f30ab25308ab83239e Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Wed, 3 May 2023 21:04:01 -0400 Subject: [PATCH 07/10] reverting --- catppuccin.tmux | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index b36e956..1b75683 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -94,7 +94,7 @@ main() { readonly date_time local datetime_icon - datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "HELLO")" + datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "")" readonly datetime_icon # These variables are the defaults so that the setw and set calls are easier to parse. From 1820d433b5e60d64214949bceb49a0150393ecec Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Thu, 4 May 2023 09:28:47 -0400 Subject: [PATCH 08/10] DANG COMMAs --- catppuccin.tmux | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index 1b75683..9a239d0 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -78,7 +78,7 @@ main() { readonly user local user_icon - user_icon="$(get_tmux_option "@catppuccin_user_icon", "")" + user_icon="$(get_tmux_option "@catppuccin_user_icon" "")" readonly user_icon local host @@ -86,7 +86,7 @@ main() { readonly host local host_icon - host_icon="$(get_tmux_option "@catppuccin_host_icon", "󰒋")" + host_icon="$(get_tmux_option "@catppuccin_host_icon" "󰒋")" readonly host_icon local date_time @@ -94,7 +94,7 @@ main() { readonly date_time local datetime_icon - datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon", "")" + datetime_icon="$(get_tmux_option "@catppuccin_datetime_icon" "")" readonly datetime_icon # These variables are the defaults so that the setw and set calls are easier to parse. From 334d4d52a25e83e8ff3ff3808bff18e69fcad7f5 Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Fri, 5 May 2023 07:07:17 -0400 Subject: [PATCH 09/10] all icons --- catppuccin.tmux | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/catppuccin.tmux b/catppuccin.tmux index 9a239d0..36c5829 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -85,6 +85,18 @@ main() { host="$(get_tmux_option "@catppuccin_host" "off")" readonly host + local directory_icon + directory_icon="$(get_tmux_option "@catppuccin_directory_icon" "")" + readonly directory_icon + + local window_icon + window_icon="$(get_tmux_option "@catppuccin_window_icon" "")" + readonly window_icon + + local session_icon + session_icon="$(get_tmux_option "@catppuccin_session_icon" "")" + readonly session_icon + local host_icon host_icon="$(get_tmux_option "@catppuccin_host_icon" "󰒋")" readonly host_icon @@ -99,13 +111,13 @@ main() { # These variables are the defaults so that the setw and set calls are easier to parse. local show_directory - readonly show_directory="#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]$right_separator#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} #{?client_prefix,#[fg=$thm_red]" + readonly show_directory="#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]$right_separator#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics]$directory_icon #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} #{?client_prefix,#[fg=$thm_red]" local show_window - readonly show_window="#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]$right_separator#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red]" + readonly show_window="#[fg=$thm_pink,bg=$thm_bg,nobold,nounderscore,noitalics]$right_separator#[fg=$thm_bg,bg=$thm_pink,nobold,nounderscore,noitalics]$window_icon #[fg=$thm_fg,bg=$thm_gray] #W #{?client_prefix,#[fg=$thm_red]" local show_session - readonly show_session="#[fg=$thm_green]}#[bg=$thm_gray]$right_separator#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg] #[fg=$thm_fg,bg=$thm_gray] #S " + readonly show_session="#[fg=$thm_green]}#[bg=$thm_gray]$right_separator#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg]$session_icon #[fg=$thm_fg,bg=$thm_gray] #S " local show_directory_in_window_status readonly show_directory_in_window_status="#[fg=$thm_bg,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_gray] #{b:pane_current_path} " From 41bbbfa76673dd493930720b70ed1cfad0840d4f Mon Sep 17 00:00:00 2001 From: Parker Kain Date: Thu, 25 May 2023 15:42:55 -0400 Subject: [PATCH 10/10] README Updates --- README.md | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 8106ae2..9f3d10d 100644 --- a/README.md +++ b/README.md @@ -77,8 +77,8 @@ set -g @catppuccin_right_separator "█" ##### Enable DateTime -By default, the `date_time` componenet is set to off. -It can be enabled by specifing any tmux date and time format. +By default, the `date_time` component is set to off. +It can be enabled by specifying any tmux date and time format. ```sh set -g @catppuccin_date_time "%Y-%m-%d %H:%M" @@ -86,8 +86,8 @@ set -g @catppuccin_date_time "%Y-%m-%d %H:%M" ##### Enable User -By default, the `user` componenet is set to off. -It can be enabled by toggoling it on. +By default, the `user` component is set to off. +It can be enabled by toggling it on. ```sh set -g @catppuccin_user "on" @@ -95,13 +95,29 @@ set -g @catppuccin_user "on" ##### Enable Host -By default, the `host` componenet is set to off. -It can be enabled by toggoling it on. +By default, the `host` component is set to off. +It can be enabled by toggling it on. ```sh set -g @catppuccin_host "on" ``` +##### Customize Icons + +Each of the components comes with their own default icon, which +can be changed to fit your preference or requirements of your font. + +*Note: NerdFont Icons do not render properly in the Github UI, so the below example +does not use them* +```sh +set -g @catppuccin_datetime_icon "A" +set -g @catppuccin_user_icon "B" +set -g @catppuccin_directory_icon "C" +set -g @catppuccin_window_icon "D" +set -g @catppuccin_session_icon "E" +set -g @catppuccin_host_icon "F" +``` + [style-guide]: https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md ## 💝 Thanks to