From 37f361bd8f6de9873ed7caa518b15a6aecfa8d70 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Sun, 6 Jun 2021 16:01:57 +0200
Subject: [PATCH] tmux, vim: enable true color support properly

---
 .tmux.conf |  3 +++
 .vimrc     | 28 +++++++++++-----------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/.tmux.conf b/.tmux.conf
index 85f5faa..94fb912 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -5,6 +5,9 @@ set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
 set -g @plugin 'odedlaz/tmux-onedark-theme'
 set -g @onedark_date_format "%d.%m.%y"
 
+set -g default-terminal "tmux-256color"
+set -ga terminal-overrides ",alacritty:Tc,*256col*:Tc"
+
 # Scroll History
 set -g history-limit 50000
 
diff --git a/.vimrc b/.vimrc
index b097866..af4f1b3 100644
--- a/.vimrc
+++ b/.vimrc
@@ -31,23 +31,17 @@ set listchars=tab:>-,eol:$,trail:.,extends:#
 
 packadd! onedark.vim
 
-
-"Use 24-bit (true-color) mode in Vim/Neovim when outside tmux.
-"If you're using tmux version 2.2 or later, you can remove the outermost $TMUX check and use tmux's 24-bit color support
-"(see < http://sunaku.github.io/tmux-24bit-color.html#usage > for more information.)
-if (empty($TMUX))
-  if (has("nvim"))
-    "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
-    let $NVIM_TUI_ENABLE_TRUE_COLOR=1
-  endif
-  "For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
-  "Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
-  " < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
-  if (has("termguicolors"))
-    set termguicolors
-    let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
-    let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
-  endif
+if (has("nvim"))
+  "For Neovim 0.1.3 and 0.1.4 < https://github.com/neovim/neovim/pull/2198 >
+  let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+endif
+"For Neovim > 0.1.5 and Vim > patch 7.4.1799 < https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162 >
+"Based on Vim patch 7.4.1770 (`guicolors` option) < https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd >
+" < https://github.com/neovim/neovim/wiki/Following-HEAD#20160511 >
+if (has("termguicolors"))
+  set termguicolors
+  let &t_8f = "\<Esc>[38;2;%lu;%lu;%lum"
+  let &t_8b = "\<Esc>[48;2;%lu;%lu;%lum"
 endif
 
 syntax on