Update plugins/tpm

.gitignore

@@ -1 +1,2 @@
-*~
+plugins/*
+*~

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "plugins/tpm"]
 	path = plugins/tpm
-	url = https://github.com/tmux-plugins/tpm
+	url = https://github.com/tmux-plugins/tpm.git

README.md

@@ -3,10 +3,23 @@
 
 Configuration files for tmux
 
+Installation
+------------
+
+Make sure to clone the tpm submodule as well:
+```
+git clone --recursive git@gitlab.wojciechkozlowski.eu:config/tmux.git .tmux
+```
+
+Install all other plugins:
+* Launch tmux
+* Run `ctrl + a + I`
+ 
 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
 ```

config/tmux-basic.conf

@@ -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

config/tmux-minimal.conf

@@ -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

config/tmux.conf

@@ -1,90 +0,0 @@
-# Global options ----------------------------------
-
-# Set tmux to use 256 colours
-set -g default-terminal "xterm-256color"
-#"screen-256color"
-
-# 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
-unbind C-b
-set -g prefix C-a
-bind C-a send-prefix
-
-# confirm before killing a window or the server
-bind-key C-d confirm kill-pane
-bind-key C-k confirm kill-window
-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
-set -g status-fg "#eeeeee"
-set -g status-bg "#005577"
-set -g status-attr default
-
-# default window title colors
-set-window-option -g window-status-fg "#002b36"
-set-window-option -g window-status-bg default
-set-window-option -g window-status-attr default
-
-# active window title colors
-set-window-option -g window-status-current-fg "#eeeeee"
-set-window-option -g window-status-current-bg default
-set-window-option -g window-status-current-attr default
-
-# default pane border colors
-set -g pane-border-fg default
-set -g pane-border-bg default
-
-# active pane border colors
-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   \
- '
-
-# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
-run '~/.tmux/plugins/tpm/tpm'

plugins/tmux-sensible

@@ -1 +0,0 @@
-Subproject commit 526110eb9b60825d3276afba97ffa4cedb4b0ab9

plugins/tpm

@@ -1 +1 @@
-Subproject commit b4c89884e0a8a97fdc1fd470688677867e14e801
+Subproject commit b699a7e01c253ffb7818b02d62bce24190ec1019

tmux.conf

@@ -0,0 +1,54 @@
+# Status bar --------------------------------------
+
+# 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
+
+# Custom bindings ---------------------------------
+
+# Change prefix to Ctrl-a like in Screen
+unbind C-b
+set -g prefix C-a
+bind C-a send-prefix
+
+# confirm before killing a window or the server
+bind-key C-d confirm kill-pane
+bind-key C-k confirm kill-window
+bind-key M-k confirm kill-server
+
+# toggle statusbar
+bind-key b set-option status
+
+# Colors ------------------------------------------
+
+# default statusbar colors
+set -g status-style bg="#005577",fg="#eeeeee"
+
+# default window title colors
+set -g window-status-style bg=default,fg="#002b36"
+
+# active window title colors
+set -g window-status-current-style bg=default,fg="#eeeeee"
+
+# default pane border colors
+set -g pane-border-style bg=default,fg=default
+
+# active pane border colors
+set -g pane-active-border-style bg=default,fg="#005577"
+
+# Plugin manager ----------------------------------
+
+set -g @tpm_plugins '          \
+  tmux-plugins/tpm             \
+  tmux-plugins/tmux-sensible   \
+ '
+
+# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
+run '~/.tmux/plugins/tpm/tpm'