From 306cdd9e2ca0d88d7ec43eb4c2614f8459cd620a Mon Sep 17 00:00:00 2001
From: Michiel Scholten <michiel@diginaut.net>
Date: Fri, 10 Aug 2018 17:38:09 +0200
Subject: [PATCH] Better true colour support

---
 .config/fish/config.fish |  2 +-
 .tmux.conf               |  3 ++-
 .vimrc                   | 20 +++++++++-----------
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 7661aa0..9c801fb 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -88,7 +88,7 @@ function grepl
 end
 
 ## Various
-alias tmux 'tmux -2'
+#alias tmux 'tmux -2'
 alias tmux_reload "tmux source-file ~/.tmux.conf"
 alias tmux_takeover "tmux detach -a"
 
diff --git a/.tmux.conf b/.tmux.conf
index ed17606..a95c6a3 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -3,7 +3,8 @@ set -g bell-action any
 
 # Default termtype. If the rcfile sets $TERM, that overrides this value.
 set -g default-terminal tmux-256color-italic
-set -g terminal-overrides ',tmux-256color-italic:Tc'
+#set -g terminal-overrides ',tmux-256color-italic:Tc'
+set -g terminal-overrides ',*256col*:Tc'
 
 # Keep your finger on ctrl, or don't
 bind-key ^D detach-client
diff --git a/.vimrc b/.vimrc
index e3e2cbf..5607532 100644
--- a/.vimrc
+++ b/.vimrc
@@ -431,22 +431,20 @@ set hidden
 set cryptmethod=blowfish2
 
 " Ensure 256 colour support if the terminal supports it
-"if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
-    "set t_Co=256
-    " The "^[" is a single character. You enter it by pressing Ctrl+v and then ESC.
-    set t_8f=^[[38;2;%lu;%lu;%lum
-    set t_8b=^[[48;2;%lu;%lu;%lum
-
+if &term == "xterm" || &term == "xterm-256color" || &term == "screen-bce" || &term == "screen-256color" || &term == "screen" || &term == "tmux-256color-italic"
     colorscheme falcon
 
-    " This is what sets vim to use 24-bit colors. It will also work for any version of neovim
-    " newer than 0.1.4.
-    set termguicolors
-
     " create a bar for airline
     set laststatus=2
     let g:airline_powerline_fonts = 1
-"endif
+endif
+
+" This is what sets vim to use 24-bit colors. It will also work for any version of neovim
+if exists('+termguicolors')
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
+  set termguicolors
+endif
 
 " Toggle paste and autoindent mode (enable paste so no indention weirdness
 " happens when pasting into the current file)