From 5f2c7293a48b54dbf7346aeca26a4bcfcfc38cb0 Mon Sep 17 00:00:00 2001 From: Von Random Date: Thu, 28 Apr 2016 16:39:05 +0300 Subject: [PATCH] truecolor is upon us (tmux), so switch back to termite --- rc.lua | 2 +- shellrc | 8 +++++--- termite_config | 2 +- tmux.conf | 7 +++---- 4 files changed, 10 insertions(+), 9 deletions(-) diff --git a/rc.lua b/rc.lua index 1a500d8..40b8491 100644 --- a/rc.lua +++ b/rc.lua @@ -87,7 +87,7 @@ if exists(wallpaper) then end -- This is used later as the default terminal and editor to run. -terminal = 'urxvt' +terminal = 'termite' editor = 'gvim' editor_cmd = editor diff --git a/shellrc b/shellrc index e35c1cd..31e0882 100644 --- a/shellrc +++ b/shellrc @@ -21,6 +21,10 @@ if [[ -z ${fqdn} ]]; then export fqdn="$(hostname)" fi +if [[ ${TERM} == "xterm-termite" || -n ${TMUX} ]]; then + export NVIM_TUI_ENABLE_TRUE_COLOR=1 +fi + newline=" " vscripts="${HOME}/vscripts" @@ -108,14 +112,11 @@ alias sup='command svn up' # }}} # {{{ common functions screenoff-disable() { xset -dpms; xset s off; } - screenoff-enable() { xset +dpms; xset s on; } - dotfiles-update() { git --work-tree="${dotfiles}" --git-dir="${dotfiles}/.git" pull; } if ! is_ksh; then hide-info() { hide_info=true; } - unhide-info() { unset hide_info; } fi @@ -126,6 +127,7 @@ tmuxrc() { tmux source-file "${HOME}/.tmux.conf"; tmux display-message "Config r if [[ -z "${DISPLAY}" ]]; then x() { exec xinit -- :0 -nolisten tcp vt$XDG_VTNR; } fi + # }}} if is_ksh; then # {{{ # {{{ ~ options diff --git a/termite_config b/termite_config index 96c94a7..ab3ff21 100644 --- a/termite_config +++ b/termite_config @@ -44,4 +44,4 @@ color15 = #fdf6e3 [hints] font = Terminus 9 - vim: ft=dosini cms=#%s +# vim: ft=dosini cms=#%s diff --git a/tmux.conf b/tmux.conf index 068b598..41a9a3f 100644 --- a/tmux.conf +++ b/tmux.conf @@ -39,8 +39,7 @@ set -g history-limit "10000" set -g set-titles "off" set -g status-left-length "20" set -g status-right-length "40" -set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@" - +set -g terminal-overrides "rxvt-unicode*:sitm@,ritm@,xterm-termite:Tc,xterm-256color:Tc" set -g default-terminal "screen-256color" set -g status-position "top" set -g status-justify "centre" @@ -62,8 +61,8 @@ set -g status-bg "colour7" set -g message-command-fg "colour8" set -g message-command-bg "colour11" setw -g window-status-fg "colour14" -setw -g window-status-activity-bg "colour7" -setw -g window-status-activity-fg "colour10" +#setw -g window-status-activity-bg "colour7" +#setw -g window-status-activity-fg "colour10" setw -g window-status-bg "colour7" setw -g window-status-current-format "#[fg=colour8,bg=colour7][#I:#W]#[default]" set -g status-left "#[fg=colour15,bg=colour11,bold] #h #[fg=colour11,bg=colour14,nobold,nounderscore,noitalics]#[fg=colour7,bg=colour14] #S #[fg=colour14,bg=colour7,nobold,nounderscore,noitalics]#[default]"