diff --git a/.gitmodules b/.gitmodules index d5c9daf..f537b6b 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,18 +4,9 @@ [submodule "tmux/.tmux/plugins/tmux-autoreload"] path = tmux/.tmux/plugins/tmux-autoreload url = https://git::@github.com/b0o/tmux-autoreload -[submodule "tmux/.tmux/plugins/tmux-open"] - path = tmux/.tmux/plugins/tmux-open - url = https://git::@github.com/tmux-plugins/tmux-open -[submodule "tmux/.tmux/plugins/tmux-powerline"] - path = tmux/.tmux/plugins/tmux-powerline - url = https://git::@github.com/erikw/tmux-powerline [submodule "tmux/.tmux/plugins/tmux-sensible"] path = tmux/.tmux/plugins/tmux-sensible url = https://git::@github.com/tmux-plugins/tmux-sensible -[submodule "tmux/.tmux/plugins/tmux-power"] - path = tmux/.tmux/plugins/tmux-power - url = https://git::@github.com/wfxr/tmux-power [submodule "tmux/.tmux/plugins/tmux"] path = tmux/.tmux/plugins/tmux url = https://github.com/catppuccin/tmux.git diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index de745b2..1dd647b 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -23,31 +23,66 @@ set -ga update-environment TERM_PROGRAM #=== PLUGINS ===# set -g @plugin 'tmux-plugins/tpm' set -g @plugin 'tmux-plugins/tmux-sensible' -set -g @plugin 'tmux-plugins/tmux-open' -set -g @plugin 'wfxr/tmux-power' set -g @plugin 'catppuccin/tmux' set-option -g @plugin 'b0o/tmux-autoreload' set -g @plugin 'tmux-plugins/tmux-resurrect' set -g @plugin 'tmux-plugins/tmux-continuum' -set -g @plugin 'tmux-plugins/tmux-newsboat' -# Customizing Catppuccin theme -set -g @catppuccin_flavour 'mocha' -set -g @catppuccin_window_left_separator "" -set -g @catppuccin_window_right_separator " " -set -g @catppuccin_window_middle_separator " █" -set -g @catppuccin_window_number_position "right" -set -g @catppuccin_window_default_fill "number" -set -g @catppuccin_window_default_text "#W" -set -g @catppuccin_window_current_fill "number" -set -g @catppuccin_window_current_text "#W" -set -g @catppuccin_status_modules_right "directory user host session" -set -g @catppuccin_status_left_separator " " -set -g @catppuccin_status_right_separator "" -set -g @catppuccin_status_fill "icon" -set -g @catppuccin_status_connect_separator "no" -set -g @catppuccin_directory_text "#{pane_current_path}" -set-option -g status-position top +# Configure Catppuccin +set -g @catppuccin_flavor "mocha" +set -g @catppuccin_status_background "none" +set -g @catppuccin_window_status_style "none" +set -g @catppuccin_pane_status_enabled "off" +set -g @catppuccin_pane_border_status "off" + +# Configure Online +set -g @online_icon "ok" +set -g @offline_icon "nok" + +# status left look and feel +set -g status-left-length 100 +set -g status-left "" +set -ga status-left "#{?client_prefix,#{#[bg=#{@thm_red},fg=#{@thm_bg},bold]  #S },#{#[bg=#{@thm_bg},fg=#{@thm_green}]  #S }}" +set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│" +set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_maroon}]  #{pane_current_command} " +set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]│" +set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_blue}]  #{=/-32/...:#{s|$USER|~|:#{b:pane_current_path}}} " +set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_overlay_0},none]#{?window_zoomed_flag,│,}" +set -ga status-left "#[bg=#{@thm_bg},fg=#{@thm_yellow}]#{?window_zoomed_flag,  zoom ,}" + +# status right look and feel +set -g status-right-length 100 +set -g status-right "" +# set -ga status-right "#{?#{e|>=:10,#{battery_percentage}},#{#[bg=#{@thm_red},fg=#{@thm_bg}]},#{#[bg=#{@thm_bg},fg=#{@thm_pink}]}} #{battery_icon} #{battery_percentage} " +# set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│" +set -g status-right '#(gitmux "#{pane_current_path}")' +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}, none]│" +set -ga status-right "#[bg=#{@thm_bg},fg=#{@thm_blue}] 󰭦 %Y-%m-%d 󰅐 %H:%M " + +set -g status-position top +set -g status-style "bg=#{@thm_bg}" +set -g status-justify "absolute-centre" + +# pane border look and feel +setw -g pane-border-status top +setw -g pane-border-format "" +setw -g pane-active-border-style "bg=#{@thm_bg},fg=#{@thm_overlay_0}" +setw -g pane-border-style "bg=#{@thm_bg},fg=#{@thm_surface_0}" +setw -g pane-border-lines single + +# window look and feel +set -wg automatic-rename on +set -g automatic-rename-format "Window" + +set -g window-status-format " #I#{?#{!=:#{window_name},Window},: #W,} " +set -g window-status-style "bg=#{@thm_bg},fg=#{@thm_rosewater}" +set -g window-status-last-style "bg=#{@thm_bg},fg=#{@thm_peach}" +set -g window-status-activity-style "bg=#{@thm_red},fg=#{@thm_bg}" +set -g window-status-bell-style "bg=#{@thm_red},fg=#{@thm_bg},bold" +set -gF window-status-separator "#[bg=#{@thm_bg},fg=#{@thm_overlay_0}]│" + +set -g window-status-current-format " #I#{?#{!=:#{window_name},Window},: #W,} " +set -g window-status-current-style "bg=#{@thm_peach},fg=#{@thm_bg},bold" # Continuum options set -g @continuum-restore 'on' diff --git a/tmux/.tmux/plugins/tmux-open b/tmux/.tmux/plugins/tmux-open deleted file mode 160000 index 763d0a8..0000000 --- a/tmux/.tmux/plugins/tmux-open +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 763d0a852e6703ce0f5090a508330012a7e6788e diff --git a/tmux/.tmux/plugins/tmux-power b/tmux/.tmux/plugins/tmux-power deleted file mode 160000 index 16bbde8..0000000 --- a/tmux/.tmux/plugins/tmux-power +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 16bbde801378a70512059541d104c5ae35be32b9 diff --git a/tmux/.tmux/plugins/tmux-powerline b/tmux/.tmux/plugins/tmux-powerline deleted file mode 160000 index 269d359..0000000 --- a/tmux/.tmux/plugins/tmux-powerline +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 269d359f21925e5e3bfcf5902ce26c817ddbcf04