diff --git a/Rakefile b/Rakefile index 76fbd35..b73e7f8 100644 --- a/Rakefile +++ b/Rakefile @@ -2,17 +2,14 @@ require 'rake' require 'fileutils' require File.join(File.dirname(__FILE__), 'bin', 'yadr', 'vundle') -# TODO install for vim_instant_markdown - +# this has all the runcoms from this directory. task :link_files do - install_files(Dir.glob('git/*')) - install_files(Dir.glob('irb/*')) - install_files(Dir.glob('ruby/*')) - install_files(Dir.glob('ctags/*')) - install_files(Dir.glob('tmux/*')) - install_files(Dir.glob('vimify/*')) - install_files(Dir.glob('{vim,vimrc}')) - Rake::Task["install_prezto"].execute + install_files(Dir.glob('git/*')) if want_to_install?('git configs (color, aliases)') + install_files(Dir.glob('irb/*')) if want_to_install?('irb/pry configs (more colorful)') + install_files(Dir.glob('ruby/*')) if want_to_install?('rubygems config (faster/no docs)') + install_files(Dir.glob('ctags/*')) if want_to_install?('ctags config (better js/ruby support)') + install_files(Dir.glob('tmux/*')) if want_to_install?('tmux config') + install_files(Dir.glob('vimify/*')) if want_to_install?('vimification of command line tools') end desc "Hook our dotfiles into system-standard positions." @@ -26,13 +23,7 @@ task :install => [:submodule_init, :submodules] do install_homebrew if RUBY_PLATFORM.downcase.include?("darwin") install_rvm_binstubs - # this has all the runcoms from this directory. - install_files(Dir.glob('git/*')) if want_to_install?('git configs (color, aliases)') - install_files(Dir.glob('irb/*')) if want_to_install?('irb/pry configs (more colorful)') - install_files(Dir.glob('ruby/*')) if want_to_install?('rubygems config (faster/no docs)') - install_files(Dir.glob('ctags/*')) if want_to_install?('ctags config (better js/ruby support)') - install_files(Dir.glob('tmux/*')) if want_to_install?('tmux config') - install_files(Dir.glob('vimify/*')) if want_to_install?('vimification of command line tools') + Rake::Task["link_files"].execute if want_to_install?('vim configuration (highly recommended)') install_files(Dir.glob('{vim,vimrc}')) Rake::Task["install_vundle"].execute diff --git a/tmux/tmux.conf b/tmux/tmux.conf index cde5c09..9cd398f 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,3 +1,8 @@ +# List of plugins +set -g @plugin 'tmux-plugins/tpm' +set -g @plugin 'tmux-plugins/tmux-sensible' +set -g @plugin 'tmux-plugins/tmux-yank' + # Ring the bell if any background window rang a bell set -g bell-action any @@ -91,3 +96,7 @@ bind r source-file ~/.tmux.conf \; display "Reloaded!" # Local config if-shell "[ -f ~/.tmux.conf.user ]" 'source ~/.tmux.conf.user' + +set -g @plugin 'tmux-plugins/tmux-yank' + +run '~/.tmux/plugins/tpm/tpm' diff --git a/tmux/tmux/plugins/tmux-sensible b/tmux/tmux/plugins/tmux-sensible new file mode 160000 index 0000000..526110e --- /dev/null +++ b/tmux/tmux/plugins/tmux-sensible @@ -0,0 +1 @@ +Subproject commit 526110eb9b60825d3276afba97ffa4cedb4b0ab9 diff --git a/tmux/tmux/plugins/tmux-yank b/tmux/tmux/plugins/tmux-yank new file mode 160000 index 0000000..feb9611 --- /dev/null +++ b/tmux/tmux/plugins/tmux-yank @@ -0,0 +1 @@ +Subproject commit feb9611b7d1c323ca54cd8a5111a53e3e8265b59 diff --git a/tmux/tmux/plugins/tpm b/tmux/tmux/plugins/tpm new file mode 160000 index 0000000..c8ac32a --- /dev/null +++ b/tmux/tmux/plugins/tpm @@ -0,0 +1 @@ +Subproject commit c8ac32a085d382c43190bda4fb5972e531f501fd