From aabf03d69b16a476fb77c0a454dfc0aa712cf217 Mon Sep 17 00:00:00 2001 From: psox Date: Fri, 6 May 2022 13:37:23 +0100 Subject: [PATCH] merge some local tmux config changes to git --- oh-my-zsh | 2 +- tmux/tmux.conf | 21 +++++++++++++++++---- zsh-custom/plugins/zsh-completions | 2 +- 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/oh-my-zsh b/oh-my-zsh index 4d9e5ce..8f56a8b 160000 --- a/oh-my-zsh +++ b/oh-my-zsh @@ -1 +1 @@ -Subproject commit 4d9e5ce9a7d8db3c3aadcae81580a5c3ff5a0e8b +Subproject commit 8f56a8bdf39d7727ab0e220f0164f78c77f9c50e diff --git a/tmux/tmux.conf b/tmux/tmux.conf index e79febf..dae31d0 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -20,6 +20,7 @@ bind-key a send-prefix set -g status-fg '#EEEEEE' set -g status-bg '#333333' set -g pane-border-status top +set -g pane-border-format '╢#[fg=#AA2277,italics]#{session_group}#[default] #[fg=#337755,bold,normal]#P/#D #[default,italics,fg=yellow]#{pane_tty}#[default]╟' set -g display-panes-colour '#334400' set -g mouse off set -s escape-time 0 @@ -27,14 +28,21 @@ set -g visual-activity on set -g status-left-length 200 set -g status-right-length 200 set -g status-left '#{prefix_highlight} #[fg=blue,bold]#h #S:#I.#P (#D) #[default]' -set -g status-right '#T #[fg=yellow,bold]#(uptime -p)#[default] #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default] ' +set -g status-right '#T #[fg=yellow,bold]#( awk "{print \$1/86400,\"days\"}" /proc/uptime )#[default] #[fg=cyan,bold]%Y-%m-%d %H:%M:%S#[default] ' set -g set-titles on + setw -g aggressive-resize on setw -g monitor-activity on + # The following three makes italics work in tmux set -g xterm-keys on -set -g default-terminal "xterm-256color" +set -g default-terminal "tmux-256color" + +# set 24bit color for terminal that support it set -as terminal-overrides ',xterm*:sitm=\E[3m' +set -as terminal-overrides ",xterm*:Tc" +set -as terminal-overrides ",alacritty*:Tc" +set -as terminal-overrides ",tmux-*:Tc" # Refresh status line every 5 seconds set -g status-interval 5 @@ -47,8 +55,12 @@ bind-key e set-window-option synchronize-panes on bind-key E set-window-option synchronize-panes off bind m set -g mouse on \; display 'Mouse: ON' bind M set -g mouse off \; display 'Mouse: OFF' -bind + new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \; swap-pane -s tmux-zoom.0 \; select-window -t tmux-zoom -bind - last-window \; swap-pane -s tmux-zoom.0 \; kill-window -t tmux-zoom +bind + new-window -d -n tmux-zoom 'clear && echo TMUX ZOOM && read' \ + \; swap-pane -s tmux-zoom.0 \ + \; select-window -t tmux-zoom +bind - last-window \ + \; swap-pane -s tmux-zoom.0 \ + \; kill-window -t tmux-zoom # prefix + / to search bind-key / copy-mode \; send-key ? @@ -59,3 +71,4 @@ if "test -f ~/.config/tmux/late.conf" { # Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf) run -b "$TMUX_PLUGINS/tpm/tpm" + diff --git a/zsh-custom/plugins/zsh-completions b/zsh-custom/plugins/zsh-completions index 6db5ddc..ca484ea 160000 --- a/zsh-custom/plugins/zsh-completions +++ b/zsh-custom/plugins/zsh-completions @@ -1 +1 @@ -Subproject commit 6db5ddc6559ad8f66ca22a29365b34ad8d573884 +Subproject commit ca484eac407a7a2c35437c93e1c3248512ae2061