diff --git a/.config/gitmux/gitmux.yaml b/.config/gitmux/gitmux.yaml index 373f2d5..b37e1fb 100644 --- a/.config/gitmux/gitmux.yaml +++ b/.config/gitmux/gitmux.yaml @@ -9,7 +9,7 @@ tmux: modified: ' !' untracked: '?' stashed: '⚑ ' - clean: ' ✔ ' + clean: '✔ ' styles: clear: '#[fg=default]' state: '#[bg=red,fg=white]' @@ -17,10 +17,10 @@ tmux: remote: '#[fg=cyan]' staged: '#[fg=green]' conflict: '#[fg=red]' - modified: '#[fg=#827717,bg=#ffc107]' - untracked: '#[fg=magenta,bg=#ffc107]' + modified: '#[fg=#000000,bg=#ffc107]' + untracked: '#[fg=#000000,bg=#ffc107]' stashed: '#[fg=cyan]' - clean: '#[fg=#e8f5e9,bg=#33691e]' + clean: '#[fg=#e8f5e9,bg=#00796b]' layout: [branch, divergence, ' ', flags, ' '] options: branch_max_len: 0 diff --git a/.tmux.conf b/.tmux.conf index ece49fb..163ded2 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -55,10 +55,10 @@ bind-key -T copy-mode-vi WheelDownPane select-pane \; send-keys -X -N 1 scroll-d setw -g window-status-format "" setw -g window-status-current-format "" setw -g window-status-separator "" -set -g status-style "bg=#455a64,fg=#f5f5f5" +set -g status-style "bg=#3e3e3e,fg=#f5f5f5" set -g status-left-length 0 -set -g status-left "#[bg=#263238,fg=#78909C] #I #[bg=#455a64,fg=#cfd8dc] #{=|60|…:pane_current_path} " -set -g status-right '#[bg=#0d47a1,fg=#e1f5fe] ☸ #(kubectl config current-context) #(~/go/bin/gitmux -cfg ~/.config/gitmux/gitmux.yaml "#{pane_current_path}")' +set -g status-left "#[bg=#3e3e3e,fg=#78909C] #I #[bg=#3e3e3e,fg=#cfd8dc] #{=|45|…:pane_current_path} " +set -g status-right '#[bg=#0d47a1,fg=#e1f5fe] ☸ #{=|-18|…:@kubectx} #(~/go/bin/gitmux -cfg ~/.config/gitmux/gitmux.yaml "#{pane_current_path}")' set -g status-right-length 0 set -g set-titles on diff --git a/.zshrc b/.zshrc index 16e63c1..da4700d 100644 --- a/.zshrc +++ b/.zshrc @@ -161,6 +161,7 @@ export ANSIBLE_NOCOWS=1 ## Prompt function _pre(){ # echo -ne "\033]0;${PWD}\007" + tmux set -g @kubectx $(kubectl config current-context) tmux refresh-client -S } starship_precmd_user_func="_pre"