Merge pull request square#156 from slam/tmux_local

Add tmux.conf.local
azi · May 14, 2014 · 5461fe7 · 5461fe7
2 parents dbc906c + 34433a1
commit 5461fe7
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -44,8 +44,8 @@ You can adjust the size of the smaller panes in `tmux.conf` by lowering or incre
     rake
 
 ## Customize
-In your home directory, Maximum Awesome creates a `.vimrc.local` file where you can customize
-Vim to your heart’s content. However, we’d love to incorporate your changes and improve Vim
+In your home directory, Maximum Awesome creates `.vimrc.local`, `.vimrc.bundles.local` and `.tmux.conf.local` files where you can customize
+Vim and tmux to your heart’s content. However, we’d love to incorporate your changes and improve Vim and tmux
 for everyone, so feel free to fork Maximum Awesome and open some pull requests!
 
 ## Uninstall

diff --git a/Rakefile b/Rakefile
@@ -212,7 +212,8 @@ end
 
 COPIED_FILES = filemap(
   'vimrc.local'         => '~/.vimrc.local',
-  'vimrc.bundles.local' => '~/.vimrc.bundles.local'
+  'vimrc.bundles.local' => '~/.vimrc.bundles.local',
+  'tmux.conf.local'     => '~/.tmux.conf.local'
 )
 
 LINKED_FILES = filemap(

diff --git a/tmux.conf b/tmux.conf
@@ -93,3 +93,5 @@ set-option -g default-command "/bin/bash -c 'which reattach-to-user-namespace >/
 
 # Allow the arrow key to be used immediately after changing windows
 set-option -g repeat-time 0
+
+source-file ~/.tmux.conf.local
diff --git a/tmux.conf.local b/tmux.conf.local
@@ -0,0 +1 @@
+# Add your local tmux config here
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,3 +93,5 @@ set-option -g default-command "/bin/bash -c 'which reattach-to-user-namespace >/

		# Allow the arrow key to be used immediately after changing windows
		set-option -g repeat-time 0

		source-file ~/.tmux.conf.local