From fce7853d4ca471f79ad785a51bbf8bba257cea27 Mon Sep 17 00:00:00 2001 From: Valentin Uveges Date: Wed, 29 Mar 2023 08:45:18 +0300 Subject: [PATCH 1/3] feat(datetime): add new date time component --- README.md | 9 +++++++++ catppuccin.tmux | 17 +++++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/README.md b/README.md index 36a2d67..3990be0 100644 --- a/README.md +++ b/README.md @@ -73,6 +73,15 @@ set -g @catppuccin_left_separator "█" set -g @catppuccin_right_separator "█" ``` +##### Enable DateTime + +By default, the `date_time` componenet is set to off. +It can be enabled by specifing the tmux date and time format. + +```sh +set -g @catppuccin_date_time "%Y-%m-%d %H:%M" +``` + [style-guide]: https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md ## 💝 Thanks to diff --git a/catppuccin.tmux b/catppuccin.tmux index 185f090..7c250e2 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -73,22 +73,35 @@ main() { left_separator="$(get_tmux_option "@catppuccin_left_separator" "")" readonly left_separator + local date_time + date_time="$(get_tmux_option "@catppuccin_date_time" "off")" + readonly date_time + # 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]" + 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]" + 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 " + 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} " + local show_directory_in_window_status_current readonly show_directory_in_window_status_current="#[fg=$thm_bg,bg=$thm_orange] #I #[fg=$thm_fg,bg=$thm_bg] #{b:pane_current_path} " + local show_window_in_window_status readonly show_window_in_window_status="#[fg=$thm_fg,bg=$thm_bg] #W #[fg=$thm_bg,bg=$thm_blue] #I#[fg=$thm_blue,bg=$thm_bg]$left_separator#[fg=$thm_fg,bg=$thm_bg,nobold,nounderscore,noitalics] " + local show_window_in_window_status_current 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_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 @@ -107,6 +120,10 @@ main() { window_status_current_format=$show_window_in_window_status_current fi + if [[ "${date_time}" != "off" ]]; then + right_column2=$right_column2$show_date_time + fi + set status-left "" set status-right "${right_column1},${right_column2}" From def29854b51149455aecf2e4fd0a4112b69a75ba Mon Sep 17 00:00:00 2001 From: Valentin Uveges Date: Wed, 29 Mar 2023 12:40:43 +0300 Subject: [PATCH 2/3] feat(components): add user and host components --- README.md | 20 +++++++++++++++++++- catppuccin.tmux | 22 ++++++++++++++++++++++ 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 3990be0..d0f1388 100644 --- a/README.md +++ b/README.md @@ -75,13 +75,31 @@ set -g @catppuccin_right_separator "█" ##### Enable DateTime -By default, the `date_time` componenet is set to off. +By default, the `date_time` componenet is set to off. It can be enabled by specifing the tmux date and time format. ```sh 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. + +```sh +set -g @catppuccin_user "on" +``` + +##### Enable Host + +By default, the `host` componenet is set to off. +It can be enabled by toggoling it on. + +```sh +set -g @catppuccin_host "on" +``` + [style-guide]: https://github.com/catppuccin/catppuccin/blob/main/docs/style-guide.md ## 💝 Thanks to diff --git a/catppuccin.tmux b/catppuccin.tmux index 7c250e2..72ce019 100755 --- a/catppuccin.tmux +++ b/catppuccin.tmux @@ -73,6 +73,14 @@ main() { left_separator="$(get_tmux_option "@catppuccin_left_separator" "")" readonly left_separator + local user + user="$(get_tmux_option "@catppuccin_user" "off")" + readonly user + + local host + host="$(get_tmux_option "@catppuccin_host" "off")" + readonly host + local date_time date_time="$(get_tmux_option "@catppuccin_date_time" "off")" readonly date_time @@ -99,6 +107,12 @@ main() { local show_window_in_window_status_current 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) " + + 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 " + 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 " @@ -120,6 +134,14 @@ main() { window_status_current_format=$show_window_in_window_status_current fi + if [[ "${user}" == "on" ]]; then + right_column2=$right_column2$show_user + fi + + if [[ "${host}" == "on" ]]; then + right_column2=$right_column2$show_host + fi + if [[ "${date_time}" != "off" ]]; then right_column2=$right_column2$show_date_time fi From c493721bb10240dde7c524c961afe4351c70d12b Mon Sep 17 00:00:00 2001 From: Valentin Uveges Date: Fri, 31 Mar 2023 17:29:36 +0300 Subject: [PATCH 3/3] feat(components): update readme with for fonts --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d0f1388..8106ae2 100644 --- a/README.md +++ b/README.md @@ -52,6 +52,8 @@ All flavours support certain levels of customization that match our [Catppuccin Style Guide][style-guide]. To add these customizations, add any of the following options to your Tmux configuration. +In order to have the correct icons displayed please use your favorite nerd fonts patched font. + ##### Enable window tabs By default, the theme places the `window-status` in the `status-right`. With @@ -76,7 +78,7 @@ set -g @catppuccin_right_separator "█" ##### Enable DateTime By default, the `date_time` componenet is set to off. -It can be enabled by specifing the tmux date and time format. +It can be enabled by specifing any tmux date and time format. ```sh set -g @catppuccin_date_time "%Y-%m-%d %H:%M"