Replace powerline by airline
This commit is contained in:
parent
2dfc428839
commit
a5e6e2e49b
5 changed files with 243 additions and 1 deletions
203
common/.shell_prompt.sh
Normal file
203
common/.shell_prompt.sh
Normal file
|
@ -0,0 +1,203 @@
|
||||||
|
#
|
||||||
|
# This shell prompt config file was created by promptline.vim
|
||||||
|
#
|
||||||
|
function __promptline_host {
|
||||||
|
local only_if_ssh="0"
|
||||||
|
|
||||||
|
if [ ! $only_if_ssh -o -n "${SSH_CLIENT}" ]; then
|
||||||
|
if [[ -n ${ZSH_VERSION-} ]]; then print %m; elif [[ -n ${FISH_VERSION-} ]]; then hostname -s; else printf "%s" \\h; fi
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
function __promptline_last_exit_code {
|
||||||
|
|
||||||
|
[[ $last_exit_code -gt 0 ]] || return 1;
|
||||||
|
|
||||||
|
printf "%s" "$last_exit_code"
|
||||||
|
}
|
||||||
|
function __promptline_ps1 {
|
||||||
|
local slice_prefix slice_empty_prefix slice_joiner slice_suffix is_prompt_empty=1
|
||||||
|
|
||||||
|
# section "a" header
|
||||||
|
slice_prefix="${a_bg}${sep}${a_fg}${a_bg}${space}" slice_suffix="$space${a_sep_fg}" slice_joiner="${a_fg}${a_bg}${alt_sep}${space}" slice_empty_prefix="${a_fg}${a_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "a" slices
|
||||||
|
__promptline_wrapper "$(__promptline_host)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# section "b" header
|
||||||
|
slice_prefix="${b_bg}${sep}${b_fg}${b_bg}${space}" slice_suffix="$space${b_sep_fg}" slice_joiner="${b_fg}${b_bg}${alt_sep}${space}" slice_empty_prefix="${b_fg}${b_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "b" slices
|
||||||
|
__promptline_wrapper "$USER" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# section "c" header
|
||||||
|
slice_prefix="${c_bg}${sep}${c_fg}${c_bg}${space}" slice_suffix="$space${c_sep_fg}" slice_joiner="${c_fg}${c_bg}${alt_sep}${space}" slice_empty_prefix="${c_fg}${c_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "c" slices
|
||||||
|
__promptline_wrapper "$(__promptline_cwd)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# section "y" header
|
||||||
|
slice_prefix="${y_bg}${sep}${y_fg}${y_bg}${space}" slice_suffix="$space${y_sep_fg}" slice_joiner="${y_fg}${y_bg}${alt_sep}${space}" slice_empty_prefix="${y_fg}${y_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "y" slices
|
||||||
|
__promptline_wrapper "$(__promptline_vcs_branch)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# section "warn" header
|
||||||
|
slice_prefix="${warn_bg}${sep}${warn_fg}${warn_bg}${space}" slice_suffix="$space${warn_sep_fg}" slice_joiner="${warn_fg}${warn_bg}${alt_sep}${space}" slice_empty_prefix="${warn_fg}${warn_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "warn" slices
|
||||||
|
__promptline_wrapper "$(__promptline_last_exit_code)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# close sections
|
||||||
|
printf "%s" "${reset_bg}${sep}$reset$space"
|
||||||
|
}
|
||||||
|
function __promptline_vcs_branch {
|
||||||
|
local branch
|
||||||
|
local branch_symbol=" "
|
||||||
|
|
||||||
|
# git
|
||||||
|
if hash git 2>/dev/null; then
|
||||||
|
if branch=$( { git symbolic-ref --quiet HEAD || git rev-parse --short HEAD; } 2>/dev/null ); then
|
||||||
|
branch=${branch##*/}
|
||||||
|
printf "%s" "${branch_symbol}${branch:-unknown}"
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
return 1
|
||||||
|
}
|
||||||
|
function __promptline_cwd {
|
||||||
|
local dir_limit="3"
|
||||||
|
local truncation="⋯"
|
||||||
|
local first_char
|
||||||
|
local part_count=0
|
||||||
|
local formatted_cwd=""
|
||||||
|
local dir_sep=" "
|
||||||
|
local tilde="~"
|
||||||
|
|
||||||
|
local cwd="${PWD/#$HOME/$tilde}"
|
||||||
|
|
||||||
|
# get first char of the path, i.e. tilde or slash
|
||||||
|
[[ -n ${ZSH_VERSION-} ]] && first_char=$cwd[1,1] || first_char=${cwd::1}
|
||||||
|
|
||||||
|
# remove leading tilde
|
||||||
|
cwd="${cwd#\~}"
|
||||||
|
|
||||||
|
while [[ "$cwd" == */* && "$cwd" != "/" ]]; do
|
||||||
|
# pop off last part of cwd
|
||||||
|
local part="${cwd##*/}"
|
||||||
|
cwd="${cwd%/*}"
|
||||||
|
|
||||||
|
formatted_cwd="$dir_sep$part$formatted_cwd"
|
||||||
|
part_count=$((part_count+1))
|
||||||
|
|
||||||
|
[[ $part_count -eq $dir_limit ]] && first_char="$truncation" && break
|
||||||
|
done
|
||||||
|
|
||||||
|
printf "%s" "$first_char$formatted_cwd"
|
||||||
|
}
|
||||||
|
function __promptline_left_prompt {
|
||||||
|
local slice_prefix slice_empty_prefix slice_joiner slice_suffix is_prompt_empty=1
|
||||||
|
|
||||||
|
# section "a" header
|
||||||
|
slice_prefix="${a_bg}${sep}${a_fg}${a_bg}${space}" slice_suffix="$space${a_sep_fg}" slice_joiner="${a_fg}${a_bg}${alt_sep}${space}" slice_empty_prefix="${a_fg}${a_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "a" slices
|
||||||
|
__promptline_wrapper "$(__promptline_host)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# section "b" header
|
||||||
|
slice_prefix="${b_bg}${sep}${b_fg}${b_bg}${space}" slice_suffix="$space${b_sep_fg}" slice_joiner="${b_fg}${b_bg}${alt_sep}${space}" slice_empty_prefix="${b_fg}${b_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "b" slices
|
||||||
|
__promptline_wrapper "$USER" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# section "c" header
|
||||||
|
slice_prefix="${c_bg}${sep}${c_fg}${c_bg}${space}" slice_suffix="$space${c_sep_fg}" slice_joiner="${c_fg}${c_bg}${alt_sep}${space}" slice_empty_prefix="${c_fg}${c_bg}${space}"
|
||||||
|
[ $is_prompt_empty -eq 1 ] && slice_prefix="$slice_empty_prefix"
|
||||||
|
# section "c" slices
|
||||||
|
__promptline_wrapper "$(__promptline_cwd)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; is_prompt_empty=0; }
|
||||||
|
|
||||||
|
# close sections
|
||||||
|
printf "%s" "${reset_bg}${sep}$reset$space"
|
||||||
|
}
|
||||||
|
function __promptline_wrapper {
|
||||||
|
# wrap the text in $1 with $2 and $3, only if $1 is not empty
|
||||||
|
# $2 and $3 typically contain non-content-text, like color escape codes and separators
|
||||||
|
|
||||||
|
[[ -n "$1" ]] || return 1
|
||||||
|
printf "%s" "${2}${1}${3}"
|
||||||
|
}
|
||||||
|
function __promptline_right_prompt {
|
||||||
|
local slice_prefix slice_empty_prefix slice_joiner slice_suffix
|
||||||
|
|
||||||
|
# section "warn" header
|
||||||
|
slice_prefix="${warn_sep_fg}${rsep}${warn_fg}${warn_bg}${space}" slice_suffix="$space${warn_sep_fg}" slice_joiner="${warn_fg}${warn_bg}${alt_rsep}${space}" slice_empty_prefix=""
|
||||||
|
# section "warn" slices
|
||||||
|
__promptline_wrapper "$(__promptline_last_exit_code)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; }
|
||||||
|
|
||||||
|
# section "y" header
|
||||||
|
slice_prefix="${y_sep_fg}${rsep}${y_fg}${y_bg}${space}" slice_suffix="$space${y_sep_fg}" slice_joiner="${y_fg}${y_bg}${alt_rsep}${space}" slice_empty_prefix=""
|
||||||
|
# section "y" slices
|
||||||
|
__promptline_wrapper "$(__promptline_vcs_branch)" "$slice_prefix" "$slice_suffix" && { slice_prefix="$slice_joiner"; }
|
||||||
|
|
||||||
|
# close sections
|
||||||
|
printf "%s" "$reset"
|
||||||
|
}
|
||||||
|
function __promptline {
|
||||||
|
local last_exit_code="${PROMPTLINE_LAST_EXIT_CODE:-$?}"
|
||||||
|
|
||||||
|
local esc=$'[' end_esc=m
|
||||||
|
if [[ -n ${ZSH_VERSION-} ]]; then
|
||||||
|
local noprint='%{' end_noprint='%}'
|
||||||
|
elif [[ -n ${FISH_VERSION-} ]]; then
|
||||||
|
local noprint='' end_noprint=''
|
||||||
|
else
|
||||||
|
local noprint='\[' end_noprint='\]'
|
||||||
|
fi
|
||||||
|
local wrap="$noprint$esc" end_wrap="$end_esc$end_noprint"
|
||||||
|
local space=" "
|
||||||
|
local sep=""
|
||||||
|
local rsep=""
|
||||||
|
local alt_sep=""
|
||||||
|
local alt_rsep=""
|
||||||
|
local reset="${wrap}0${end_wrap}"
|
||||||
|
local reset_bg="${wrap}49${end_wrap}"
|
||||||
|
local a_fg="${wrap}38;5;220${end_wrap}"
|
||||||
|
local a_bg="${wrap}48;5;166${end_wrap}"
|
||||||
|
local a_sep_fg="${wrap}38;5;166${end_wrap}"
|
||||||
|
local b_fg="${wrap}38;5;231${end_wrap}"
|
||||||
|
local b_bg="${wrap}48;5;31${end_wrap}"
|
||||||
|
local b_sep_fg="${wrap}38;5;31${end_wrap}"
|
||||||
|
local c_fg="${wrap}38;5;250${end_wrap}"
|
||||||
|
local c_bg="${wrap}48;5;240${end_wrap}"
|
||||||
|
local c_sep_fg="${wrap}38;5;240${end_wrap}"
|
||||||
|
local warn_fg="${wrap}38;5;231${end_wrap}"
|
||||||
|
local warn_bg="${wrap}48;5;52${end_wrap}"
|
||||||
|
local warn_sep_fg="${wrap}38;5;52${end_wrap}"
|
||||||
|
local y_fg="${wrap}38;5;250${end_wrap}"
|
||||||
|
local y_bg="${wrap}48;5;236${end_wrap}"
|
||||||
|
local y_sep_fg="${wrap}38;5;236${end_wrap}"
|
||||||
|
if [[ -n ${ZSH_VERSION-} ]]; then
|
||||||
|
PROMPT="$(__promptline_left_prompt)"
|
||||||
|
RPROMPT="$(__promptline_right_prompt)"
|
||||||
|
elif [[ -n ${FISH_VERSION-} ]]; then
|
||||||
|
if [[ -n "$1" ]]; then
|
||||||
|
[[ "$1" = "left" ]] && __promptline_left_prompt || __promptline_right_prompt
|
||||||
|
else
|
||||||
|
__promptline_ps1
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
PS1="$(__promptline_ps1)"
|
||||||
|
fi
|
||||||
|
}
|
||||||
|
|
||||||
|
if [[ -n ${ZSH_VERSION-} ]]; then
|
||||||
|
if [[ ! ${precmd_functions[(r)__promptline]} == __promptline ]]; then
|
||||||
|
precmd_functions+=(__promptline)
|
||||||
|
fi
|
||||||
|
elif [[ -n ${FISH_VERSION-} ]]; then
|
||||||
|
__promptline "$1"
|
||||||
|
else
|
||||||
|
if [[ ! "$PROMPT_COMMAND" == *__promptline* ]]; then
|
||||||
|
PROMPT_COMMAND='__promptline;'$'\n'"$PROMPT_COMMAND"
|
||||||
|
fi
|
||||||
|
fi
|
29
common/.tmux-theme
Normal file
29
common/.tmux-theme
Normal file
|
@ -0,0 +1,29 @@
|
||||||
|
# This tmux statusbar config was created by tmuxline.vim
|
||||||
|
# on mer., 16 déc. 2015
|
||||||
|
|
||||||
|
set -g status-bg "colour233"
|
||||||
|
set -g message-command-fg "colour2"
|
||||||
|
set -g status-justify "left"
|
||||||
|
set -g status-left-length "100"
|
||||||
|
set -g status "on"
|
||||||
|
set -g pane-active-border-fg "colour2"
|
||||||
|
set -g message-bg "black"
|
||||||
|
set -g status-right-length "100"
|
||||||
|
set -g status-right-attr "none"
|
||||||
|
set -g message-fg "colour2"
|
||||||
|
set -g message-command-bg "black"
|
||||||
|
set -g status-attr "none"
|
||||||
|
set -g status-utf8 "on"
|
||||||
|
set -g pane-border-fg "black"
|
||||||
|
set -g status-left-attr "none"
|
||||||
|
setw -g window-status-fg "colour2"
|
||||||
|
setw -g window-status-attr "none"
|
||||||
|
setw -g window-status-activity-bg "colour233"
|
||||||
|
setw -g window-status-activity-attr "none"
|
||||||
|
setw -g window-status-activity-fg "colour2"
|
||||||
|
setw -g window-status-separator ""
|
||||||
|
setw -g window-status-bg "colour233"
|
||||||
|
set -g status-left "#[fg=colour232,bg=colour2] #S #[fg=colour2,bg=colour233,nobold,nounderscore,noitalics]"
|
||||||
|
set -g status-right "#[fg=black,bg=colour233,nobold,nounderscore,noitalics]#[fg=colour2,bg=black] %Y-%m-%d %H:%M #[fg=colour2,bg=black,nobold,nounderscore,noitalics]#[fg=colour232,bg=colour2] #h "
|
||||||
|
setw -g window-status-format "#[fg=colour2,bg=colour233] #I #[fg=colour2,bg=colour233] #W "
|
||||||
|
setw -g window-status-current-format "#[fg=colour233,bg=black,nobold,nounderscore,noitalics]#[fg=colour2,bg=black] #I #[fg=colour2,bg=black] #W #[fg=black,bg=colour233,nobold,nounderscore,noitalics]"
|
|
@ -26,4 +26,5 @@ set -g history-limit 1000
|
||||||
#set -g status-left '#[fg=green][#[fg=brightblue]#(whoami)#[fg=white]@#[fg=brightblue]#H#[fg=white]:#[fg=brightblue]#S#[fg=green]][#[default]'
|
#set -g status-left '#[fg=green][#[fg=brightblue]#(whoami)#[fg=white]@#[fg=brightblue]#H#[fg=white]:#[fg=brightblue]#S#[fg=green]][#[default]'
|
||||||
#set -g status-right '#[fg=green]][#[fg=blue]%d/%m #[fg=brightblue]%H:%M#[fg=green]]#[default]'
|
#set -g status-right '#[fg=green]][#[fg=blue]%d/%m #[fg=brightblue]%H:%M#[fg=green]]#[default]'
|
||||||
|
|
||||||
source-file ~/.local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf
|
#source-file ~/.local/lib/python2.7/site-packages/powerline/bindings/tmux/powerline.conf
|
||||||
|
source-file ~/.tmux-theme
|
||||||
|
|
|
@ -217,6 +217,7 @@ set laststatus=2 " Always display the statusline in all windows
|
||||||
"set noshowmode " Hide the default mode text (e.g. -- INSERT -- below the statusline)
|
"set noshowmode " Hide the default mode text (e.g. -- INSERT -- below the statusline)
|
||||||
let g:airline_powerline_fonts = 1
|
let g:airline_powerline_fonts = 1
|
||||||
let g:airline_theme = "term"
|
let g:airline_theme = "term"
|
||||||
|
let g:tmuxline_theme = 'term'
|
||||||
|
|
||||||
if ! has('gui_running')
|
if ! has('gui_running')
|
||||||
set ttimeoutlen=10
|
set ttimeoutlen=10
|
||||||
|
|
|
@ -165,3 +165,11 @@ git clone https://github.com/jonathanfilip/vim-lucius.git ~/.vim/bundle/lucius
|
||||||
# Install vim renpy
|
# Install vim renpy
|
||||||
rm -rf ~/.vim/bundle/vim-renpy
|
rm -rf ~/.vim/bundle/vim-renpy
|
||||||
git clone https://github.com/chaimleib/vim-renpy ~/.vim/bundle/vim-renpy
|
git clone https://github.com/chaimleib/vim-renpy ~/.vim/bundle/vim-renpy
|
||||||
|
|
||||||
|
# Install tmux-airline generator
|
||||||
|
rm -rf ~/.vim/bundle/tmuxline
|
||||||
|
git clone https://github.com/edkolev/tmuxline.vim ~/.vim/bundle/tmuxline
|
||||||
|
|
||||||
|
# Install promptline generator
|
||||||
|
rm -rf ~/.vim/bundle/promptline
|
||||||
|
git clone https://github.com/edkolev/promptline.vim ~/.vim/bundle/promptline
|
||||||
|
|
Loading…
Reference in a new issue