Mercurial > hg > mhoward > dotfiles / changeset

--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,154 +1,3 @@
-# $Id: screen-keys.conf,v 1.7 2010-07-31 11:39:13 nicm Exp $
-#
-# By Nicholas Marriott. Public domain.
-#
-# This configuration file binds many of the common GNU screen key bindings to
-# appropriate tmux key bindings. Note that for some key bindings there is no
-# tmux analogue and also that this set omits binding some commands available in
-# tmux but not in screen.
-#
-# Note this is only a selection of key bindings and they are in addition to the
-# normal tmux key bindings. This is intended as an example not as to be used
-# as-is.
-
-# Set the prefix to ^A.
-unbind C-b
-set -g prefix ^A
-bind a send-prefix
-
-# Bind appropriate commands similar to screen.
-# lockscreen ^X x 
-unbind ^X
-bind ^X lock-server
-unbind x
-bind x lock-server
-
-# screen ^C c 
-unbind ^C
-bind ^C new-window
-unbind c
-bind c new-window
-
-# detach ^D d
-unbind ^D
-bind ^D detach
-
-# displays * 
-unbind *
-bind * list-clients
-
-# next ^@ ^N sp n 
-unbind ^@
-bind ^@ next-window
-unbind ^N
-bind ^N next-window
-unbind " "
-bind " " next-window
-unbind n
-bind n next-window
-
-# title A
-unbind A
-bind A command-prompt "rename-window %%"
-
-# other ^A
-unbind ^A
-bind ^A last-window
-
-# prev ^H ^P p ^? 
-unbind ^H
-bind ^H previous-window
-unbind ^P
-bind ^P previous-window
-unbind p
-bind p previous-window
-unbind BSpace
-bind BSpace previous-window
-
-# windows ^W w 
-unbind ^W
-bind ^W list-windows
-unbind w
-bind w list-windows
-
-# quit \ 
-unbind '\'
-bind '\' confirm-before "kill-server"
-
-# kill K k 
-unbind K
-bind K confirm-before "kill-window"
-unbind k
-bind k confirm-before "kill-window"
-
-# redisplay ^L l 
-unbind ^L
-bind ^L refresh-client
-
-# split -v |
-unbind |
-bind | split-window
-
-# :kB: focus up
-unbind Tab
-bind Tab select-pane -t:.+
-unbind BTab
-bind BTab select-pane -t:.-
-
-# " windowlist -b
-unbind '"'
-bind '"' choose-window
-
-
-unbind l
-
-
-# $Id: vim-keys.conf,v 1.2 2010-09-18 09:36:15 nicm Exp $
-#
-# vim-keys.conf, v1.2 2010/09/12
-#
-# By Daniel Thau.  Public domain.
-#
-# This configuration file binds many vi- and vim-like bindings to the
-# appropriate tmux key bindings.  Note that for many key bindings there is no
-# tmux analogue.  This is intended for tmux 1.3, which handles pane selection
-# differently from the previous versions
-
-# split windows like vim
-# vim's definition of a horizontal/vertical split is reversed from tmux's
-bind s split-window -v
-bind v split-window -h
-
-# move around panes with hjkl, as one would in vim after pressing ctrl-w
-bind h select-pane -L
-bind j select-pane -D
-bind k select-pane -U
-bind l select-pane -R
-
-# resize panes like vim
-# feel free to change the "1" to however many lines you want to resize by, only
-# one at a time can be slow
-bind < resize-pane -L 3
-bind > resize-pane -R 3
-bind - resize-pane -D 3
-bind + resize-pane -U 3
-
-# bind : to command-prompt like vim
-# this is the default in tmux already
-bind : command-prompt
-
-# vi-style controls for copy mode
-setw -g mode-keys vi
-
-############ end vim-keys.conf
-
-## Addt'l customization
-set-window-option -g mode-keys vi
-bind-key h select-pane -L
-bind-key j select-pane -D
-bind-key k select-pane -U
-bind-key l select-pane -R
-
 # Look good
 set -g default-terminal "screen-256color"
 
@@ -172,5 +21,9 @@ set -g status-fg cyan
 set -g set-titles on
 set -g set-titles-string "#h(#S)"
 
+
+source-file ~/.tmux/screen-keys.conf
+source-file ~/.tmux/vim-keys.conf
+
 if-shell '[-e ~/.tmux.conf.local]' "source ~/.tmux.conf.local"
 

new file mode 100644
--- /dev/null
+++ b/.tmux/screen-keys.conf
@@ -0,0 +1,100 @@
+# $Id: screen-keys.conf,v 1.7 2010-07-31 11:39:13 nicm Exp $
+#
+# By Nicholas Marriott. Public domain.
+#
+# This configuration file binds many of the common GNU screen key bindings to
+# appropriate tmux key bindings. Note that for some key bindings there is no
+# tmux analogue and also that this set omits binding some commands available in
+# tmux but not in screen.
+#
+# Note this is only a selection of key bindings and they are in addition to the
+# normal tmux key bindings. This is intended as an example not as to be used
+# as-is.
+
+# Set the prefix to ^A.
+unbind C-b
+set -g prefix ^A
+bind a send-prefix
+
+# Bind appropriate commands similar to screen.
+# lockscreen ^X x 
+unbind ^X
+bind ^X lock-server
+unbind x
+bind x lock-server
+
+# screen ^C c 
+unbind ^C
+bind ^C new-window
+unbind c
+bind c new-window
+
+# detach ^D d
+unbind ^D
+bind ^D detach
+
+# displays * 
+unbind *
+bind * list-clients
+
+# next ^@ ^N sp n 
+unbind ^@
+bind ^@ next-window
+unbind ^N
+bind ^N next-window
+unbind " "
+bind " " next-window
+unbind n
+bind n next-window
+
+# title A
+unbind A
+bind A command-prompt "rename-window %%"
+
+# other ^A
+unbind ^A
+bind ^A last-window
+
+# prev ^H ^P p ^? 
+unbind ^H
+bind ^H previous-window
+unbind ^P
+bind ^P previous-window
+unbind p
+bind p previous-window
+unbind BSpace
+bind BSpace previous-window
+
+# windows ^W w 
+unbind ^W
+bind ^W list-windows
+unbind w
+bind w list-windows
+
+# quit \ 
+unbind '\'
+bind '\' confirm-before "kill-server"
+
+# kill K k 
+unbind K
+bind K confirm-before "kill-window"
+unbind k
+bind k confirm-before "kill-window"
+
+# redisplay ^L l 
+unbind ^L
+bind ^L refresh-client
+
+# split -v |
+unbind |
+bind | split-window
+
+# :kB: focus up
+unbind Tab
+bind Tab select-pane -t:.+
+unbind BTab
+bind BTab select-pane -t:.-
+
+# " windowlist -b
+unbind '"'
+bind '"' choose-window

new file mode 100644
--- /dev/null
+++ b/.tmux/vim-keys.conf
@@ -0,0 +1,37 @@
+# $Id: vim-keys.conf,v 1.2 2010-09-18 09:36:15 nicm Exp $
+#
+# vim-keys.conf, v1.2 2010/09/12
+#
+# By Daniel Thau.  Public domain.
+#
+# This configuration file binds many vi- and vim-like bindings to the
+# appropriate tmux key bindings.  Note that for many key bindings there is no
+# tmux analogue.  This is intended for tmux 1.3, which handles pane selection
+# differently from the previous versions
+
+# split windows like vim
+# vim's definition of a horizontal/vertical split is reversed from tmux's
+bind s split-window -v
+bind v split-window -h
+
+# move around panes with hjkl, as one would in vim after pressing ctrl-w
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# resize panes like vim
+# feel free to change the "1" to however many lines you want to resize by, only
+# one at a time can be slow
+bind < resize-pane -L 3
+bind > resize-pane -R 3
+bind - resize-pane -D 3
+bind + resize-pane -U 3
+
+# bind : to command-prompt like vim
+# this is the default in tmux already
+bind : command-prompt
+
+# vi-style controls for copy mode
+setw -g mode-keys vi
+