Commit Graph

1502 Commits

Author SHA1 Message Date
Yan Pritzker
d75fe7e1dd Fix solarized easymotion in terminal vim 2014-11-21 11:51:33 -06:00
Yan Pritzker
b2ee7b78a0 Merge pull request #562 from jby/new_lightline_settings
Modified setings of lightline to match the README in the lightline project
2014-11-21 11:47:04 -06:00
Yan Pritzker
aca1f7662a Merge pull request #570 from lfilho/fix-macvim-external-display
Adding script to fix MacVim bug with external displays
2014-11-21 11:46:53 -06:00
Yan Pritzker
19dbe973a1 Merge pull request #571 from lfilho/move-osx-bin
Moving ./osx to ./bin/osx
2014-11-21 11:46:35 -06:00
Luiz Gonzaga dos Santos Filho
0915851bc3 Moving ./osx to ./bin/osx 2014-11-20 20:06:45 -02:00
Luiz Gonzaga dos Santos Filho
adaf8cb243 Adding shell script to fix MacVim bug with external displays
(cherry picked from commit 479a0b5b714805218fa16ed91446d19bbebffcfd)
2014-11-20 19:59:29 -02:00
Yan Pritzker
c2725078b6 Merge pull request #564 from timstott/update_documentation
Update vim enhancements README with Lightline
2014-11-19 11:43:05 -06:00
Yan Pritzker
17989c18b1 Merge pull request #565 from ianks/tmux-split
Make tmux split exactly 50%
2014-11-19 11:42:54 -06:00
Yan Pritzker
ba34831bd2 Merge pull request #569 from adamenger/patch-1
Add :q to exit shell
2014-11-19 11:42:45 -06:00
adamenger
4f6faf0561 Update aliases.zsh
Adding :q to exit your shell
2014-11-19 11:42:18 -06:00
Ian Ker-Seymer
33b781523d Make tmux split exactly 50% 2014-11-11 17:10:41 -07:00
Timothy Stott
7f2112cf68 Update vim enhancements README with Lightline 2014-11-11 21:58:51 +00:00
Jonas Bygdén
35c32f386a Modified setings of lightline to match the README in the lightline project Added indication of paste mode, added functions instead of code in call of components, added git branch glyph, added path to file being edited 2014-11-11 14:53:28 +01:00
Yan Pritzker
000c376aab Merge pull request #556 from stevenbarragan/update-multicursor-plugin
Point vim-multiple-cursors to current owner
2014-10-29 14:15:29 -05:00
Steven Barragán
8642a8d2a8 Point vim-multiple-cursors to current owner 2014-10-28 23:31:47 -07:00
Yan Pritzker
ee6e5b9590 Merge pull request #551 from dsimmons/fix/nerdtree-keybinding
[Fix] Keybinding conflict introduced as part of #526.
2014-10-25 13:37:55 -05:00
Dan Simmons
dfb65f2177 Fixed keybinding conflict introduced as part of #526. 2014-10-24 17:28:04 -04:00
Yan Pritzker
9e64c72eeb Merge pull request #549 from ianks/master
Remove vim/.vundles.local.bak from source control
2014-10-24 15:09:35 -05:00
Ian Ker-Seymer
d63c94dda7 Remove vim/.vundles.local.bak from source control 2014-10-24 14:08:51 -06:00
Yan Pritzker
ce5b38ebb0 Navigate seamlessly between vim and tmux [Fix #526] 2014-10-24 15:01:18 -05:00
Yan Pritzker
f6bdf5708e Merge pull request #510 from nikolai-b/master
separate mac and linux vim keymaping
2014-10-24 14:58:20 -05:00
Yan Pritzker
7c3bc67fe1 Merge pull request #546 from jeffwidman/patch-2
Remove deprecations from gemrc
2014-10-24 14:57:35 -05:00
Yan Pritzker
f8727bfaa7 Merge pull request #547 from tmullen/update_homebrew_path
Update to Homebrew app install path.
2014-10-24 14:57:27 -05:00
Yan Pritzker
491bdf7a64 status bar shows even on one pane [Fix #538] 2014-10-24 14:56:50 -05:00
Yan Pritzker
2d1130e740 Merge pull request #545 from jeffwidman/patch-1
Update gitignore vim settings
2014-10-24 14:55:16 -05:00
Yan Pritzker
e2f73a0d02 Merge pull request #511 from nikolai-b/git-config-fix
remove outdated git option
2014-10-24 14:55:00 -05:00
Yan Pritzker
cc242f115f Merge pull request #548 from ianks/master
Make ls/ll aliases linux friendly
2014-10-24 14:54:08 -05:00
Ian Ker-Seymer
ca5cc939a1 Make ls/ll aliases linux friendly 2014-10-24 13:29:07 -06:00
Yan Pritzker
b8a90b09d1 Update themes.md 2014-10-21 09:08:33 -05:00
Ted Mullen
7a74702693 Update to Homebrew app install path. 2014-10-18 10:23:16 -07:00
Jeff Widman
15530139e8 Remove deprecations from gemrc
Removed deprecated bulk_threshold-instance method:
http://www.rubydoc.info/github/rubygems/rubygems/Gem/ConfigFile#bulk_threshold-instance_method

--no-ri --no-rdoc is deprecated, use --no-document
Reference: http://guides.rubygems.org/command-reference/
2014-10-17 15:39:23 -07:00
Jeff Widman
c25cc91b6f Update gitignore vim settings
Pulling in updates from Github's global vim gitignore file:  https://github.com/github/gitignore/blob/master/Global/vim.gitignore
2014-10-17 15:34:20 -07:00
Yan Pritzker
f2fdd4506d gpsh now automatically sets up tracking for the current branch name 2014-10-08 13:45:00 -05:00
Yan Pritzker
d4581ce37c Increase number of recent branches 2014-09-30 11:41:12 -05:00
Nikolai B
9d30fc4041 make more mappings use Alt + readme 2014-09-29 21:33:48 +01:00
Nikolai B
9260dc8b78 use alt for more mappings 2014-09-29 20:22:56 +01:00
Yan Pritzker
8ab15c26a0 Merge pull request #532 from ianks/solarized-choice
Allow user to not use solarized
2014-09-28 06:46:30 -05:00
Yan Pritzker
e3fd0a940b Merge pull request #533 from lfilho/patch-1
Ignoring just "tags" is too generic
2014-09-28 06:45:47 -05:00
Yan Pritzker
a049258e55 Merge pull request #536 from ianks/update-prezto
Update zprezto
2014-09-28 06:45:25 -05:00
Yan Pritzker
caeb0bfb72 Merge pull request #535 from ianks/master
New windows from current pane path, easy reloading of Tmux
2014-09-28 06:45:11 -05:00
Ian Ker-Seymer
283f9d0246 Update zprezto 2014-09-27 23:34:11 -06:00
Ian Ker-Seymer
471ddc8116 Merge https://github.com/skwp/dotfiles
* https://github.com/skwp/dotfiles:
  Add aliases ('cls' and 'brewU')
  Make tmux pane resizing more natural
2014-09-24 12:42:29 -06:00
Ian Ker-Seymer
5e9a35eae3 Start tmux window in /Users/ianks/.yadr 2014-09-24 01:11:21 -06:00
Luiz Gonzaga dos Santos Filho
ba5cf1b78c Ignoring just "tags" is too generic
My application had a folder named "tags" as part of its business rules and because of this it got ignored.
I believe upadting this section according to the very link in the comment above should fix it. (not ignoring `tags/` folder).
2014-09-23 08:47:59 -03:00
Yan Pritzker
376992f143 Merge pull request #531 from ianks/master
Add aliases ('cls' and 'brewU')
2014-09-22 12:51:39 -05:00
Ian Ker-Seymer
f9c5c26b28 Add aliases ('cls' and 'brewU') 2014-09-22 00:20:27 -06:00
Ian Ker-Seymer
bcc5245826 Allow user to not use solarized 2014-09-21 23:53:57 -06:00
Yan Pritzker
755f70a66b Merge pull request #528 from ianks/resize-panes
Make tmux pane resizing more natural
2014-09-05 12:55:32 -05:00
Yan Pritzker
22ed9e5143 Merge pull request #529 from gringocl/fix-indentation
Fix indentation
2014-09-02 15:16:37 -05:00
Miles Starkenburg
bba62701d3 Fix indentation 2014-08-26 20:57:16 -07:00