bashrc: get rid of some aliases; zshrc, vimrc, vimplugrc, tmux, tigrc, xresources: some cosmetics

bashrc

@@ -35,7 +35,6 @@ less()   { command less -R "$@"; }
 tailf()  { command less -R +F "$@"; }
 rgrep()  { command grep --exclude-dir=\.git -R "$@"; }
 whence() { command -v "$@"; }
-vi()     { command vim "$@"; }
 
 # ls
 ls() { command ls --color=auto --group-directories-first "$@"; }
@@ -60,9 +59,6 @@ sush()  { command sudo -Es; }
 # vim
 vi()  { command vim "$@"; }
 
-# termcompat
-s() { "$(command -v termcompat||return 0)" ssh "$@"; }
-
 # }}}
 # {{{ plugins and traps
 # bash-completion

tigrc

@@ -0,0 +1,3 @@
+color cursor			default	green	bold
+color title-blur		default	blue
+color title-focus		default	blue	bold

tmux.conf

@@ -37,7 +37,7 @@ set -g message-style "bg=blue,fg=white"
 set -g message-command-style "bg=red,fg=white"
 set -g status on
 set -g status-style "fg=black,bg=white"
-set -g status-format[0] "#[fg=brightred,bg=black,italics] #h[#S] #[default]\ue0b8 #{W: #I:#W ,#[reverse] #I:#W #[noreverse]} #[align=right]\ue0ba#[reverse] %a %e %k:%M "
+set -g status-format[0] "#[fg=brightred,bg=black,italics] #h[#S] #[default]\ue0b0 #{W: #I:#W ,#[reverse] #I:#W #[noreverse]} #[align=right]\ue0b2#[reverse] %a %e %k:%M "
 set -g status-interval 2
 set -g status-position "bottom"
 set -g status-justify "left"

vimplugrc

@@ -54,13 +54,20 @@ if $TERM !~ '^linux'
         let &t_8b = "\u1b[48;2;%lu;%lu;%lum"
     endif
 
-    let g:gruvbox_plugin_hi_groups   = 1
-    let g:gruvbox_filetype_hi_groups = 1
     let g:lightline = {
        \ 'colorscheme': 'gruvbox8',
-       \ 'separator':    {'left': "\ue0b8", 'right': "\ue0ba"},
-       \ 'subseparator': {'left': "\ue0b9", 'right': "\ue0bb"}
+       \ 'separator':    {'left': "\ue0b0", 'right': "\ue0b2"},
+       \ 'subseparator': {'left': "\ue0b1", 'right': "\ue0b3"}
        \ }
+    let g:PaperColor_Theme_Options = {'theme': {
+       \ 'default.dark':  {'allow_bold': 1, 'allow_italic': 1},
+       \ 'default.light': {'allow_bold': 1, 'allow_italic': 1}
+       \ }}
+    let g:gruvbox_plugin_hi_groups   = 1
+    let g:gruvbox_filetype_hi_groups = 1
+    let g:solarized_use16            = 1
+    let g:solarized_extra_hi_groups  = 1
+    let g:solarized_termcolors       = 16
 
     set bg=dark
     colorscheme gruvbox8

vimrc

@@ -1,5 +1,5 @@
 set nobackup nomodeline backspace=indent,eol,start foldmethod=marker cursorline
-set list listchars=tab:\|_,nbsp:x,trail:*
+set list listchars=tab:-->,nbsp:x,trail:*
 set hlsearch incsearch ignorecase smartcase
 set scrolloff=3 sidescrolloff=15 sidescroll=1
 set tabstop=3 softtabstop=4 shiftwidth=4 smarttab expandtab autoindent

xresources

@@ -11,29 +11,53 @@ Xft.dpi:                96
 #define TERMINUS_SMALL  -xos4-terminus-*-*-*-*-12-*-*-*-*-*-iso10646-1
 #define FONT            xft:Fantasque Sans Mono:12
 
-! solarized light
-#define COLORFG #657b83
-#define COLORBG #fdf6e3
-#define COLORBD #002b36
-#define COLORCR #cb4b16
+! gruvbox
+#define COLORFG #ebdbb2
+#define COLORBG #282828
+#define COLORBD #ebdbb2
+#define COLORCR #fb4934
+
+#define COLOR0  #282828
+#define COLOR1  #cc241d
+#define COLOR2  #98971a
+#define COLOR3  #d79921
+#define COLOR4  #458588
+#define COLOR5  #b16286
+#define COLOR6  #689d6a
+#define COLOR7  #a89984
 
-#define COLOR0  #073642
-#define COLOR1  #dc322f
-#define COLOR2  #859900
-#define COLOR3  #b58900
-#define COLOR4  #268bd2
-#define COLOR5  #d33682
-#define COLOR6  #2aa198
-#define COLOR7  #eee8d5
+#define COLOR8  #928374
+#define COLOR9  #fb4934
+#define COLOR10 #b8bb26
+#define COLOR11 #fabd2f
+#define COLOR12 #83a598
+#define COLOR13 #d3869b
+#define COLOR14 #8ec07c
+#define COLOR15 #ebdbb2
 
-#define COLOR8  #002b36
-#define COLOR9  #cb4b16
-#define COLOR10 #586e75
-#define COLOR11 #657b83
-#define COLOR12 #839496
-#define COLOR13 #6c71c4
-#define COLOR14 #93a1a1
-#define COLOR15 #fdf6e3
+! solarized light
+!#define COLORFG #657b83
+!#define COLORBG #fdf6e3
+!#define COLORBD #002b36
+!#define COLORCR #cb4b16
+!
+!#define COLOR0  #073642
+!#define COLOR1  #dc322f
+!#define COLOR2  #859900
+!#define COLOR3  #b58900
+!#define COLOR4  #268bd2
+!#define COLOR5  #d33682
+!#define COLOR6  #2aa198
+!#define COLOR7  #eee8d5
+!
+!#define COLOR8  #002b36
+!#define COLOR9  #cb4b16
+!#define COLOR10 #586e75
+!#define COLOR11 #657b83
+!#define COLOR12 #839496
+!#define COLOR13 #6c71c4
+!#define COLOR14 #93a1a1
+!#define COLOR15 #fdf6e3
 ! }}}
 ! {{{ urxvt
 ! fonts

zshrc

@@ -70,8 +70,8 @@ bindkey -s '^j'   '^atime ^m'          # ctrl + j
 bindkey '^x^e'    edit-command-line
 # }}}
 # {{{ prompt
-prompt_fmt='%%k%%f[ %s %s:%s %s]\n\u276f '
-prompt_fmtn='%%k%%f[ %%{\e[2;3m%s\e[0m%%} ]\u276f '
+prompt_fmt='%%k%%f[ %s %s:%s %s]\n> '
+prompt_fmtn='%%k%%f[ %%{\e[2;3m%s\e[0m%%} ]> '
 prompt_user='%F{%(!.red.blue)}%n%f'
 prompt_host='%m'
 prompt_cwd='%F{green}%d%f'