solarized8 is back (better support for gutter); also fix window naming in tmux
This commit is contained in:
parent
ac3580c83f
commit
a3924a784c
6 changed files with 18 additions and 15 deletions
6
.gitmodules
vendored
6
.gitmodules
vendored
|
@ -28,6 +28,6 @@
|
||||||
[submodule "vim-gitgutter"]
|
[submodule "vim-gitgutter"]
|
||||||
path = vimpack/start/vim-gitgutter
|
path = vimpack/start/vim-gitgutter
|
||||||
url = https://github.com/airblade/vim-gitgutter.git
|
url = https://github.com/airblade/vim-gitgutter.git
|
||||||
[submodule "flattened"]
|
[submodule "vim-solarized8"]
|
||||||
path = vimpack/start/flattened
|
path = vimpack/start/vim-solarized8
|
||||||
url = https://github.com/romainl/flattened.git
|
url = https://github.com/lifepillar/vim-solarized8.git
|
||||||
|
|
8
bashrc
8
bashrc
|
@ -31,12 +31,12 @@ reset='\e[0m'
|
||||||
prompt_command()
|
prompt_command()
|
||||||
{
|
{
|
||||||
case ${TERM} in
|
case ${TERM} in
|
||||||
rxvt*|st*|xterm*)
|
screen*)
|
||||||
printf '\033]0;%s\007' "${HOSTNAME%%.*}"
|
|
||||||
;;
|
|
||||||
screen*|tmux*)
|
|
||||||
printf '\033k%s\033\' "${HOSTNAME%%.*}"
|
printf '\033k%s\033\' "${HOSTNAME%%.*}"
|
||||||
;;
|
;;
|
||||||
|
*)
|
||||||
|
printf '\033]0;%s\007' "${HOSTNAME%%.*}"
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
if ((UID)); then
|
if ((UID)); then
|
||||||
prompt_user="${pblack}\\u${preset} "
|
prompt_user="${pblack}\\u${preset} "
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit a4e55da1a35ea565216597f893dcf8d479aefe6a
|
|
1
vimpack/start/vim-solarized8
Submodule
1
vimpack/start/vim-solarized8
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit ff7ec263d934320deb9c49b2ca8af61caf072f01
|
9
vimrc
9
vimrc
|
@ -16,7 +16,7 @@ set t_Co=256 t_ut= termencoding=utf-8 encoding=utf-8
|
||||||
set wildmenu showcmd ruler laststatus=2
|
set wildmenu showcmd ruler laststatus=2
|
||||||
set statusline=[%F]\ %R%H%W%M\ %=[%{&fenc}/%{&ff}]\ %y\ [%4l/%L:%3v]
|
set statusline=[%F]\ %R%H%W%M\ %=[%{&fenc}/%{&ff}]\ %y\ [%4l/%L:%3v]
|
||||||
" update window title
|
" update window title
|
||||||
if $TERM =~ '^\(screen\|tmux\)'
|
if $TERM =~ '^screen'
|
||||||
set t_ts=k
|
set t_ts=k
|
||||||
set t_fs=\
|
set t_fs=\
|
||||||
endif
|
endif
|
||||||
|
@ -66,10 +66,13 @@ if v:version >= 800
|
||||||
nmap <Leader>a <Plug>(EasyAlign)
|
nmap <Leader>a <Plug>(EasyAlign)
|
||||||
|
|
||||||
" enable packs based on filetype
|
" enable packs based on filetype
|
||||||
autocmd FileType python packadd jedi-vim | packadd ale
|
let g:ale_python_flake8_executable = 'python2'
|
||||||
|
autocmd FileType python packadd ale
|
||||||
autocmd FileType sh packadd ale
|
autocmd FileType sh packadd ale
|
||||||
|
|
||||||
colorscheme flattened_light
|
let g:solarized_extra_hi_groups = 1
|
||||||
|
let g:solarized_use16 = 1
|
||||||
|
colorscheme solarized8
|
||||||
endif
|
endif
|
||||||
|
|
||||||
syntax on
|
syntax on
|
||||||
|
|
8
zshrc
8
zshrc
|
@ -75,12 +75,12 @@ PROMPT3='%b%f?%(!.%F{red}.%F{black})#%f%b '
|
||||||
PROMPT4='%b%f+%N:%i%(!.%F{red}.%F{black})>%f%b '
|
PROMPT4='%b%f+%N:%i%(!.%F{red}.%F{black})>%f%b '
|
||||||
precmd.title() {
|
precmd.title() {
|
||||||
case $TERM in
|
case $TERM in
|
||||||
st*|xterm*|rxvt*)
|
screen*)
|
||||||
printf '\033]0;%s\007' ${HOST%%.*}
|
|
||||||
;;
|
|
||||||
screen*|tmux*)
|
|
||||||
printf '\033k%s\033\' ${HOST%%.*}
|
printf '\033k%s\033\' ${HOST%%.*}
|
||||||
;;
|
;;
|
||||||
|
*)
|
||||||
|
printf '\033]0;%s\007' ${HOST%%.*}
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
precmd.is_git_repo() {
|
precmd.is_git_repo() {
|
||||||
|
|
Loading…
Reference in a new issue