diff --git a/.config/gitmux/gitmux.yaml b/.config/gitmux/gitmux.yaml index b37e1fb..3a5d049 100644 --- a/.config/gitmux/gitmux.yaml +++ b/.config/gitmux/gitmux.yaml @@ -1,6 +1,6 @@ tmux: symbols: - branch: '⎇ ' + branch: ' ' hashprefix: ':' ahead: ↑· behind: ↓· @@ -13,14 +13,14 @@ tmux: styles: clear: '#[fg=default]' state: '#[bg=red,fg=white]' - branch: '#[fg=#e0f2f1,bg=#00796b] ' + branch: '#[fg=white,bg=green] ' remote: '#[fg=cyan]' staged: '#[fg=green]' conflict: '#[fg=red]' modified: '#[fg=#000000,bg=#ffc107]' untracked: '#[fg=#000000,bg=#ffc107]' stashed: '#[fg=cyan]' - clean: '#[fg=#e8f5e9,bg=#00796b]' + clean: '#[fg=#e8f5e9,bg=green]' layout: [branch, divergence, ' ', flags, ' '] options: branch_max_len: 0 diff --git a/.config/starship.toml b/.config/starship.toml index c342279..dc0afab 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -1,11 +1,11 @@ add_newline = false -prompt_order = [ - "directory", - "git_status", - "git_state", - "character", -] +format = """\ +$directory\ +$git_status\ +$git_state\ +$character\ +""" [character] symbol = "%%" diff --git a/.tmux.conf b/.tmux.conf index 163ded2..9e4a88e 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -55,11 +55,11 @@ 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=#3e3e3e,fg=#f5f5f5" +set -g status-style "bg=#3e3e3e,fg=#c0c0c0" set -g status-left-length 0 -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 status-left '#{=|30|…:pane_current_path}' +set -g status-right '#[fg=#f7f7f7]#{@starship}▕#(~/go/bin/gitmux -cfg ~/.config/gitmux/gitmux.yaml "#{pane_current_path}")' set -g set-titles on set -g set-titles-string "#H - #T" diff --git a/.zshrc b/.zshrc index da4700d..2974467 100644 --- a/.zshrc +++ b/.zshrc @@ -159,14 +159,12 @@ GOPROXY=https://proxy.golang.org/ 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" -precmd_functions+=(_pre) - eval "$(starship init zsh)" +function _precmd(){ + tmux set -w @starship "$(env STARSHIP_CONFIG=$HOME/.config/starship-tmux.toml starship prompt -s ${STATUS:-0} -j ${NUM_JOBS:-0} -d ${STARSHIP_DURATION:-0})" +} +starship_precmd_user_func="_precmd" +precmd_functions+=(_precmd) + export PATH=$HOME/bin:$PATH