Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

We’re showing branches in this repository, but you can also compare across forks.

base fork: skwp/dotfiles
...
head fork: skwp/dotfiles
  • 5 commits
  • 5 files changed
  • 3 commit comments
  • 1 contributor
4 .gitmodules
View
@@ -166,10 +166,6 @@
path = vim/bundle/austintaylor-vim-indentobject
url = https://github.com/austintaylor/vim-indentobject
ignore = dirty
-[submodule "vim/bundle/jpalardy-vim-slime"]
- path = vim/bundle/jpalardy-vim-slime
- url = https://github.com/jpalardy/vim-slime
- ignore = dirty
[submodule "vim/bundle/vim-scripts-ZoomWin"]
path = vim/bundle/vim-scripts-ZoomWin
url = https://github.com/vim-scripts/ZoomWin.git
8 README.md
View
@@ -317,11 +317,11 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
#### RSI-reduction
* `Cmd-k` and `Cmd-d` to type underscores and dashes (use Shift), since they are so common in code but so far away from home row
- * `;` in addition to `:` - avoid Shift for common tasks, just hit semicolon to get to ex mode
- * `,.` to go to last edit location instead of `'.` because the apostrophe is hard on the pinky
+ * `Cmd-k` and `Cmd-d` to type underscores and dashes (use Shift), since they are so common in code but so far away from home row
+ * `Ctrl-l` to insert a => hashrocket (thanks @garybernhardt)
+ * `,.` to go to last edit location (same as `'.`) because the apostrophe is hard on the pinky
* `Cmd-'` and `Cmd-"` to change content inside quotes
* Cmd-Space to autocomplete. Tab for snipmate snippets.
- * `fd` and `jk` key *chords* - hit the first two homerow buttons simultaneously on either side of the keyboard to go to beginning and end of line
* `,ci` to change inside any set of quotes/brackets/etc
#### Tab Navigation
@@ -333,7 +333,7 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
* `Ctrl-h,l,j,k` - to move left, right, down, up between windows
* `Q` - Intelligent Window Killer. Close window `wincmd c` if there are multiple windows to same buffer, or kill the buffer `bwipeout` if this is the last window into it.
- * `+` and `-` for resizing vertical windows
+ * Arrow keys - resize windows (up/down for vertical, left=make smaller horizontally, right=make bigger horizontally)
#### Splits
1  vim/bundle/jpalardy-vim-slime
@@ -1 +0,0 @@
-Subproject commit af0c3d49c7ac678cec9dae0a3a23cf5b00e3dd7c
4 vim/plugin/settings/vim-ruby-conque.vim
View
@@ -1,7 +1,3 @@
-" Default to rspec 1. If you want
-" rspec 2, set this to 'rspec'
-let g:ruby_conque_rspec_command='spec'
-
" prevent auto insert mode, which is helpful when using conque
" term for running tests
"
14 vim/plugin/settings/yadr-keymap.vim
View
@@ -38,10 +38,8 @@ imap <silent> <D-d> _
imap <silent> <D-K> -
imap <silent> <D-D> -
-" Use the two first fingers on both sides of the keyboard
-" simultaneously to go to the beginning or end of line
-Arpeggio nnoremap jk $
-Arpeggio nnoremap fd 0
+" gary bernhardt's hashrocket
+imap <c-l> <space>=><space>
" Change inside quotes with Cmd-" and Cmd-'
nnoremap <D-'> ci'
@@ -141,9 +139,11 @@ map <silent> <D-9> :tabn 9<cr>
nnoremap <silent> vv <C-w>v
nnoremap <silent> ss <C-w>s
-" Resize vertical windows by hitting plus and minus
-nnoremap <silent> + <C-w>+
-nnoremap <silent> - <C-w>-
+" Resize windows with arrow keys
+nnoremap <Up> <C-w>+
+nnoremap <Down> <C-w>-
+nnoremap <Left> <C-w><
+nnoremap <Right> <C-w>>
" create <%= foo %> erb tags using Ctrl-k in edit mode
imap <silent> <C-K> <%= %><Esc>3hi

Showing you all comments on commits in this comparison.

Taybin Rutkin

I had neither spec or rspec installed, which caused a warning on every launch.

Yan Pritzker
Owner

So the warning is gone now? I updated the vim-ruby-conque plugin to not warn anymore i think

Taybin Rutkin

Yes, I uninstalled rspec and I don't get the warning anymore.

Something went wrong with that request. Please try again.