From ade5e8fe6e45b82f7d24b2752e9d15f6e4b69352 Mon Sep 17 00:00:00 2001 From: Aaron Gutierrez Date: Fri, 16 Mar 2018 08:09:10 -0700 Subject: [PATCH 1/3] Italics in tmux --- install | 5 ++++- profiles/tmux-256color.terminfo | 4 ++++ profiles/xterm-256color-italic.terminfo | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 profiles/tmux-256color.terminfo create mode 100644 profiles/xterm-256color-italic.terminfo diff --git a/install b/install index 49579a4..1ee666a 100755 --- a/install +++ b/install @@ -6,4 +6,7 @@ git submodule update; cd .vim/bundle/vimproc.vim && make && cd ../../.. -rsync --exclude ".git/" --exclude ".git*" --exclude "install" --exclude "py3status" --exclude "bin/" -avhE --no-perms . ~; +tic -x profiles/xterm-256color-italic.terminfo +tic -x profiles/tmux-256color.terminfo + +rsync --exclude ".git/" --exclude ".git*" --exclude "install" --exclude "profiles" --exclude "py3status" --exclude "bin/" -avhE --no-perms . ~; diff --git a/profiles/tmux-256color.terminfo b/profiles/tmux-256color.terminfo new file mode 100644 index 0000000..3f481a4 --- /dev/null +++ b/profiles/tmux-256color.terminfo @@ -0,0 +1,4 @@ +tmux-256color|tmux with 256 colors, + ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, Ms@, + khome=\E[1~, kend=\E[4~, + use=xterm-256color, use=screen-256color, diff --git a/profiles/xterm-256color-italic.terminfo b/profiles/xterm-256color-italic.terminfo new file mode 100644 index 0000000..268e449 --- /dev/null +++ b/profiles/xterm-256color-italic.terminfo @@ -0,0 +1,3 @@ +xterm-256color-italic|xterm with 256 colors and italic, + sitm=\E[3m, ritm=\E[23m, + use=xterm-256color, From 63686c7dcc43e22efd5d2d7ae59d2dcfc1085145 Mon Sep 17 00:00:00 2001 From: Aaron Gutierrez Date: Fri, 16 Mar 2018 08:13:16 -0700 Subject: [PATCH 2/3] Configure tmux to use italics --- .tmux.conf | 4 ++++ .zshrc | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.tmux.conf b/.tmux.conf index 28a4162..9c89bb9 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -4,6 +4,10 @@ set-option -g mouse on set -g mode-keys vi set -g history-limit 10000 +# configure TERM +set -g default-terminal 'tmux-256color' +set -as terminal-overrides ',xterm*:Tc:sitm=\E[3m' + # y and p bind Escape copy-mode unbind p diff --git a/.zshrc b/.zshrc index 1a414f9..63051f9 100644 --- a/.zshrc +++ b/.zshrc @@ -15,7 +15,7 @@ export CLICOLOR=1 export MAIL=/var/spool/mail/amgutier export LSCOLORS=DxGxcxdxCxegedabagacad -export TERM=xterm-256color #256 color support +export TERM=xterm-256color-italic export LESSOPEN='|/usr/local/bin/lesspipe.sh %s' export LESS_ADVANCED_PREPROCESSOR=1 From 56eb74910ca576e30c4e1993f62cc6ddc36531a4 Mon Sep 17 00:00:00 2001 From: Aaron Gutierrez Date: Fri, 16 Mar 2018 08:50:09 -0700 Subject: [PATCH 3/3] Update colors for diffs --- .vim/colors/materialbox.vim | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/.vim/colors/materialbox.vim b/.vim/colors/materialbox.vim index 62b8a9f..26ba795 100644 --- a/.vim/colors/materialbox.vim +++ b/.vim/colors/materialbox.vim @@ -134,6 +134,11 @@ let s:gb.faded_purple = ['#6a1b9a', 96] " 143-63-113 let s:gb.faded_aqua = ['#303F9F', 66] " 66-123-88 let s:gb.faded_orange = ['#E65100', 130] " 175-58-3 +let s:gb.dark_red = ['#522828', 52] " 82-40-40 +let s:gb.dark_green = ['#1e5221', 22] " 30-82-33 +let s:gb.dark_yellow = ['#66602f', 58] " 102-96-47 +let s:gb.dark_blue = ['#07203d', 17] " 7-32-61 + " }}} " Setup Emphasis: {{{ @@ -618,14 +623,11 @@ endif " }}} " Diffs: {{{ -call s:HL('DiffDelete', s:red, s:bg0, s:inverse) -call s:HL('DiffAdd', s:green, s:bg0, s:inverse) -"call s:HL('DiffChange', s:bg0, s:blue) -"call s:HL('DiffText', s:bg0, s:yellow) - -" Alternative setting -call s:HL('DiffChange', s:aqua, s:bg0, s:inverse) -call s:HL('DiffText', s:yellow, s:bg0, s:inverse) +" Changes background, not foreground for better symbol highlighting +call s:HL('DiffDelete', s:none, s:gb.dark_red) +call s:HL('DiffAdd', s:none, s:gb.dark_green) +call s:HL('DiffChange', s:none, s:gb.dark_blue) +call s:HL('DiffText', s:none, s:gb.dark_yellow, s:bold) " }}} " Spelling: {{{