From 6057852b5c28aa6b97a4e2579398b5103f1dcfef Mon Sep 17 00:00:00 2001
From: Tomas Slusny <tomas.slusny@pantheon.tech>
Date: Thu, 16 Mar 2017 13:16:19 +0100
Subject: [PATCH] Fix some errors with Tmux

Signed-off-by: Tomas Slusny <tomas.slusny@pantheon.tech>
---
 .gitmodules         |  3 ---
 config/tmux.conf    | 22 +++++++++++++++-------
 lib/vim/vimproc.vim |  1 -
 3 files changed, 15 insertions(+), 11 deletions(-)
 delete mode 160000 lib/vim/vimproc.vim

diff --git a/.gitmodules b/.gitmodules
index 9e7efec3..846e8cfe 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -107,9 +107,6 @@
 [submodule "lib/vim/tsuquyomi"]
 	path = lib/vim/tsuquyomi
 	url = https://github.com/Quramy/tsuquyomi
-[submodule "lib/vim/vimproc.vim"]
-	path = lib/vim/vimproc.vim
-	url = https://github.com/Shougo/vimproc.vim
 [submodule "lib/vim/vim-polyglot"]
 	path = lib/vim/vim-polyglot
 	url = https://github.com/sheerun/vim-polyglot
diff --git a/config/tmux.conf b/config/tmux.conf
index b939dc5e..b263955f 100644
--- a/config/tmux.conf
+++ b/config/tmux.conf
@@ -61,9 +61,6 @@
   set-option -g visual-silence off
   set-option -g bell-action none
 
-  # Turn status line off
-  set -g status off
-
   # Command bar
   set -g message-command-bg "colour0"
   set -g message-command-fg "colour7"
@@ -72,13 +69,24 @@
   set -g pane-border-fg "colour19"
   set -g pane-active-border-fg "colour4"
 
+  # Titles
+  set -g set-titles on
+  set -g set-titles-string '#T'
+
+  # Status bar
+  set -g status on
+  setw -g status-bg default
+  setw -g status-fg default
+
+  set -g status-left ''
+  set -g window-status-format '#[fg=black]#I:#W#F'
+  set -g window-status-current-format '#[fg=blue]#I:#W#F'
+  set -g status-right '#[fg=cyan]#{session_name}'
+
 # }}}
 
 # Plugins {{{
 
-  # We need $DOTHOME
-  run-shell "source ~/.dotconfig"
-
   # Some sane default configuration
   run-shell "$DOTHOME/lib/tmux/tmux-sensible/sensible.tmux"
   run-shell "$DOTHOME/lib/tmux/vim-tmux-navigator/vim-tmux-navigator.tmux"
@@ -101,6 +109,6 @@
 
 # User configuration {{{
 
-  run-shell "tmux source-file $DOTHOME/usr/tmux.conf > /dev/null 2>&1; true"
+  run-shell "[ -e $DOTHOME/usr/tmux.conf ] && tmux source-file $DOTHOME/usr/tmux.conf; true"
 
 # }}}
diff --git a/lib/vim/vimproc.vim b/lib/vim/vimproc.vim
deleted file mode 160000
index 25cb83f2..00000000
--- a/lib/vim/vimproc.vim
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 25cb83f24edec4aec1e9f1329302235e7a7a7fe0