From bea87a88d517b2a9cbec83d051b501490bccb2bd Mon Sep 17 00:00:00 2001
From: Wojciech Kozlowski <wk@wojciechkozlowski.eu>
Date: Sun, 15 Dec 2019 15:53:19 +0000
Subject: [PATCH] Simplify tmux config

---
 README.md                     |  5 +++--
 config/tmux-basic.conf        | 13 -----------
 config/tmux-minimal.conf      | 11 ---------
 config/tmux.conf => tmux.conf | 42 ++++++-----------------------------
 4 files changed, 10 insertions(+), 61 deletions(-)
 delete mode 100644 config/tmux-basic.conf
 delete mode 100644 config/tmux-minimal.conf
 rename config/tmux.conf => tmux.conf (59%)

diff --git a/README.md b/README.md
index 90975ba..bae641b 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,8 @@ Install all other plugins:
 Usage
 -----
 
-Source the appropriate file from config in the file ~/.tmux.conf, e.g.
+Source the repo's config file from ~/.tmux.conf
+
 ```
-source ~/.tmux/config/tmux-i3.conf
+source ~/.tmux/tmux.conf
 ```
diff --git a/config/tmux-basic.conf b/config/tmux-basic.conf
deleted file mode 100644
index 0241d3d..0000000
--- a/config/tmux-basic.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Status bar --------------------------------------
-
-# center align the window list
-set -g status-justify centre
-
-# set the status bar
-set -g status-left "[#S@#H]"
-set -g status-right "| #[fg=cyan]#(cat /proc/loadavg | cut -d \" \" -f 1,2,3)#[default] | %H:%M %a %d-%b-%Y"
-set -g status-left-length 15
-set -g status-right-length 75
-
-# Source the common settings ----------------------
-source ~/.tmux/config/tmux.conf
diff --git a/config/tmux-minimal.conf b/config/tmux-minimal.conf
deleted file mode 100644
index b20b57d..0000000
--- a/config/tmux-minimal.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# Status bar --------------------------------------
-
-# center align the window list
-set -g status-justify centre
-
-# set the status bar
-set -g status-left ""
-set -g status-right ""
-
-# Source the common settings ----------------------
-source ~/.tmux/config/tmux.conf
diff --git a/config/tmux.conf b/tmux.conf
similarity index 59%
rename from config/tmux.conf
rename to tmux.conf
index 6a55bd9..535f2c9 100644
--- a/config/tmux.conf
+++ b/tmux.conf
@@ -1,16 +1,16 @@
-# Global options ----------------------------------
+# Status bar --------------------------------------
 
-# Set tmux to use 256 colours
-set -g default-terminal "xterm-256color"
-#"screen-256color"
+# center align the window list
+set -g status-justify centre
+
+# set the status bar
+set -g status-left ""
+set -g status-right ""
 
 # Start windows and panes at 1, not 0
 set -g base-index 1
 setw -g pane-base-index 1
 
-# super useful when using "grouped sessions" and multi-monitor setup
-setw -g aggressive-resize on
-
 # Custom bindings ---------------------------------
 
 # Change prefix to Ctrl-a like in Screen
@@ -26,25 +26,6 @@ bind-key M-k confirm kill-server
 # toggle statusbar
 bind-key b set-option status
 
-# map Vi movement keys as pane movement keys
-bind-key j select-pane -L
-bind-key k select-pane -D
-bind-key l select-pane -U
-bind-key \; select-pane -R
-
-bind -n F1 select-window -t 1
-bind -n F2 select-window -t 2
-bind -n F3 select-window -t 3
-bind -n F4 select-window -t 4
-bind -n F5 select-window -t 5
-bind -n F6 select-window -t 6
-bind -n F7 select-window -t 7
-bind -n F8 select-window -t 8
-bind -n F9 select-window -t 9
-bind -n F10 select-window -t 10
-bind -n F11 select-window -t 11
-bind -n F12 select-window -t 12
-
 # Colors ------------------------------------------
 
 # default statusbar colors
@@ -70,17 +51,8 @@ set -g pane-border-bg default
 set -g pane-active-border-fg "#005577"
 set -g pane-active-border-bg default
 
-# command/message line colors
-#set -g message-fg white
-#set -g message-bg black
-#set -g message-attr bright
-
 # Plugin manager ----------------------------------
 
-# List of plugins
-#set -g @plugin 'tmux-plugins/tpm'
-#set -g @plugin 'tmux-plugins/tmux-sensible'
-
 set -g @tpm_plugins '          \
   tmux-plugins/tpm             \
   tmux-plugins/tmux-sensible   \