diff --git a/files/helix/.config/helix/config.toml b/files/helix/.config/helix/config.toml index dc01aa0..5f44d5c 100644 --- a/files/helix/.config/helix/config.toml +++ b/files/helix/.config/helix/config.toml @@ -4,6 +4,7 @@ theme = "everforest_light" line-number = "relative" cursor-shape.insert = "bar" whitespace.render.tab = "all" +soft-wrap.enable = true [keys.normal] "_" = ["extend_line_up", "extend_to_line_bounds"] diff --git a/files/kitty/.config/kitty/kitty.conf b/files/kitty/.config/kitty/kitty.conf index e886d2b..d46f47b 100644 --- a/files/kitty/.config/kitty/kitty.conf +++ b/files/kitty/.config/kitty/kitty.conf @@ -279,7 +279,7 @@ text_composition_strategy 2.5 #: The thickness of the underline cursor (in pts). -# cursor_blink_interval -1 +cursor_blink_interval 0 #: The interval to blink the cursor (in seconds). Set to zero to #: disable blinking. Negative values mean use system default. Note @@ -1051,7 +1051,7 @@ tab_bar_style slant #: tab_title_template. # active_tab_foreground #000 -active_tab_background #000 +# active_tab_background #000 # active_tab_font_style bold-italic # inactive_tab_foreground #444 # inactive_tab_background #999 @@ -1457,7 +1457,7 @@ active_tab_background #000 #: special value of ask means that kitty will ask before opening the #: link when clicked. -# shell_integration enabled +shell_integration no-cursor #: Enable shell integration on supported shells. This enables features #: such as jumping to previous prompts, browsing the output of the diff --git a/files/tmux/.tmux.conf b/files/tmux/.tmux.conf index 4a8803a..08a9428 100644 --- a/files/tmux/.tmux.conf +++ b/files/tmux/.tmux.conf @@ -75,103 +75,9 @@ set-option -g status-interval 1 set-option -g set-titles on set-option -g set-titles-string "#H: #W" -########## Styling ########## -# set -g status-position top -# set -g status-justify "left" -# set -g status "on" -# set -g message-command-style "fg=#829181,bg=#e6e2cc" -# set -g pane-active-border-style "fg=#93b259" -# set -g status-style "none,bg=#e6e2cc" -# set -g message-style "fg=#829181,bg=#e6e2cc" -# set -g pane-border-style "fg=#e9e8d2" -# set -g status-right-length "100" -# set -g status-left-length "100" -# setw -g window-status-activity-style "none,fg=#93b259,bg=#e6e2cc" -# setw -g window-status-style "none,fg=#939f91,bg=#e6e2cc" -# set -g status-left "" -# set -g status-right "#[fg=#939f91,bg=#e6e2cc] #H " -# setw -g window-status-format " #I∣#W#{?window_zoomed_flag,  , }" -# setw -g window-status-current-format "#[fg=#93b259,bold] #I∣#W#{?window_zoomed_flag,  , }" - -# https://github.com/bobcats/everforest-tmux -thm_bg_dim="#efebd4" -thm_bg0="#fdf6e3" -thm_bg1="#f4f0d9" -thm_bg2="#efebd4" -thm_bg3="#e6e2cc" -thm_bg4="#e0dcc7" -thm_bg5="#bdc3af" -thm_bg_visual="#eaedc8" -thm_bg_red="#fbe3da" -thm_bg_green="#f0f1d2" -thm_bg_blue="#e9f0e9" -thm_bg_yellow="#faedcd" - -thm_fg="#5c6a72" -thm_red="#f85552" -thm_orange="#f57d26" -thm_yellow="#dfa000" -thm_green="#8da101" -thm_aqua="#35a77c" -thm_blue="#3a94c5" -thm_purple="#df69ba" -thm_grey0="#a6b0a0" -thm_grey1="#939f91" -thm_grey2="#829181" -thm_statusline1="#93b259" -thm_statusline2="#708089" -thm_statusline3="#e66868" - -# messages -set -g message-style "fg=${thm_aqua},bg=${thm_bg2},align=centre" -set -g message-command-style "fg=${thm_aqua},bg=${thm_bg2},align=centre" - -# panes -set -g pane-border-style "fg=${thm_bg2}" -set -g pane-active-border-style "fg=${thm_green}" - -# windows -setw -g window-status-activity-style "fg=${thm_fg},bg=${thm_bg0},none" -setw -g window-status-separator "" -setw -g window-status-style "fg=${thm_fg},bg=${thm_bg0},none" - -# --------=== Statusline - -set -g status-bg $thm_bg0 - -# These variables are the defaults so that the setw and set calls are easier to parse. -show_directory="#[fg=$thm_blue,bg=$thm_bg0,nobold,nounderscore,noitalics]#[fg=$thm_bg0,bg=$thm_blue,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_bg2] #{b:pane_current_path} #{?client_prefix,#[fg=$thm_red]" -show_window="#[fg=$thm_purple,bg=$thm_bg0,nobold,nounderscore,noitalics]#[fg=$thm_bg0,bg=$thm_purple,nobold,nounderscore,noitalics] #[fg=$thm_fg,bg=$thm_bg2] #W #{?client_prefix,#[fg=$thm_red]" -show_session="#[fg=$thm_green]}#[bg=$thm_bg2]#{?client_prefix,#[bg=$thm_red],#[bg=$thm_green]}#[fg=$thm_bg0] #[fg=$thm_fg,bg=$thm_bg2] #S " -show_directory_in_window_status="#[fg=$thm_bg0,bg=$thm_blue] #I #[fg=$thm_fg,bg=$thm_bg2] #{b:pane_current_path} " -show_directory_in_window_status_current="#[fg=$thm_bg0,bg=$thm_orange] #I #[fg=$thm_fg,bg=$thm_bg0] #{b:pane_current_path} " -color_zoomed="#{?window_zoomed_flag,$thm_yellow,$thm_bg5}" -show_window_in_window_status="#[fg=$thm_fg,bg=$thm_bg0] #W #[fg=$thm_bg0,bg=$color_zoomed] #I#[fg=$color_zoomed,bg=$thm_bg0]#[fg=$thm_fg,bg=$thm_bg0,nobold,nounderscore,noitalics] " -color_zoomed="#{?window_zoomed_flag,$thm_orange,$thm_green}" -show_window_in_window_status_current="#[fg=$thm_fg,bg=$thm_bg2] #W #[fg=$thm_bg0,bg=$color_zoomed] #I#[fg=$color_zoomed,bg=$thm_bg0]#[fg=$thm_fg,bg=$thm_bg0,nobold,nounderscore,noitalics] " - -# Right column 1 by default shows the Window name. -right_column1=$show_window - -# Right column 2 by default shows the current Session name. -right_column2=$show_session - -# Window status by default shows the current directory basename. -window_status_format=$show_directory_in_window_status -window_status_current_format=$show_directory_in_window_status_current - -# NOTE: With the @everforest_window_tabs_enabled set to on, we're going to -# update the right_column1 and the window_status_* variables. -right_column1=$show_directory -window_status_format=$show_window_in_window_status -window_status_current_format=$show_window_in_window_status_current - +# Status +set -g status-style "bg=default" +set -g status-right "" set -g status-left "" -set -g status-right "${right_column1},${right_column2}" - -setw -g window-status-format "${window_status_format}" -setw -g window-status-current-format "${window_status_current_format}" - -# --------=== Modes -setw -g clock-mode-colour "${thm_blue}" -setw -g mode-style "fg=${thm_purple} bg=${thm_bg3} bold" +setw -g window-status-format "#I:#W " +setw -g window-status-current-format "#I:#W*"