Skip to content

Commit a6234e0

Browse files
committed
Merge branch 'master' of github.com:AndrewRayCode/configs
2 parents ad1703a + a369383 commit a6234e0

4 files changed

Lines changed: 6 additions & 5 deletions

File tree

.bashrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1001,6 +1001,7 @@ function jgrep() {
10011001
cat ~/dev/rake-routes | grep "$1"
10021002
}
10031003

1004+
[[ -s /Users/andrewray/.rsvm/rsvm.sh ]] && . /Users/andrewray/.rsvm/rsvm.sh # This loads RSVM
10041005

10051006
# aliased to "sw"
10061007
# Easily checkout git branches, listed from a dialog menu

.vimrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1491,7 +1491,7 @@ Project '~/dev/devise-two-factor/demo' , 'devise-two-factor-demo'
14911491
Project '~/workerbee/OpusWeb/mvp_webpack', 'bee site'
14921492
Project '~/rails-tutorial' , 'rails tutorial'
14931493
Project '~/dev/onboarding-tech-notes' , 'onboarding tech notes'
1494-
1494+
Project '~/closed-source-projects' , 'closed source projects'
14951495

14961496
"------------------------------------------------------------------------------
14971497
" Script-runner (I don't really use this anymore)

code/keybindings.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
// First undo TERRIBLE defaults by vscode_block_travel
1313
// https://github.com/sashaweiss/vscode_block_travel/blob/ba6cedc998a82d054ad499c8a96dffac4ca0aef7/package.json#L45
1414
{ "key": "shift+alt+down", "command": "editor.action.copyLinesDownAction",
15-
"when": "editorTextFocus && !editorReadonly" },
1615
{ "key": "shift+alt+up", "command": "editor.action.copyLinesUpAction",
1716
"when": "editorTextFocus && !editorReadonly" },
1817
// { "key": "cmd+alt+up", "command": "block-travel.selectUp",
@@ -34,10 +33,10 @@
3433
// terrible defaults for "rails run specs"
3534
{ "key": "shift+cmd+t", "command": "workbench.action.reopenClosedEditor" },
3635
{ "key": "cmd+k cmd+f", "command": "extension.runFileSpecs" },
37-
3836
{
3937
"key": "alt+cmd+n",
4038
"command": "workbench.action.compareEditor.nextChange",
4139
"when": "editorTextFocus"
4240
}
43-
]
41+
]
42+

code/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,5 +75,6 @@
7575
],
7676
"window.title": "${activeEditorMedium}${separator}${rootName}",
7777
"javascript.updateImportsOnFileMove.enabled": "always",
78-
"typescript.updateImportsOnFileMove.enabled": "always"
78+
"typescript.updateImportsOnFileMove.enabled": "always",
79+
"workbench.panel.location": "bottom"
7980
}

0 commit comments

Comments
 (0)