Skip to content

Commit 0707d80

Browse files
committed
vscode
1 parent c6df734 commit 0707d80

3 files changed

Lines changed: 19 additions & 69 deletions

File tree

.bashrc

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

1004+
if type "bat" > /dev/null 2>&1; then
1005+
alias cat='bat --theme=TwoDark'
1006+
else
1007+
echo 'bat not found'
1008+
echo 'Suggest: brew install bat'
1009+
fi
1010+
1011+
10041012
[[ -s /Users/andrewray/.rsvm/rsvm.sh ]] && . /Users/andrewray/.rsvm/rsvm.sh # This loads RSVM
10051013

10061014
# aliased to "sw"
@@ -1093,3 +1101,6 @@ if [ -d "$TRACKER_FLOW_PATH" ]; then
10931101
. "$TRACKER_FLOW_PATH/tracker_completion.bash"
10941102
fi
10951103

1104+
function ding() {
1105+
afplay /System/Library/Sounds/Glass.aiff
1106+
}

code/keybindings.json

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,6 @@
99
{ "key": "cmd-alt-m", "command": "workbench.action.terminal.focus" },
1010
{ "key": "cmd-alt-m", "command": "workbench.action.terminal.focus" },
1111

12-
// First undo TERRIBLE defaults by vscode_block_travel
13-
// https://github.com/sashaweiss/vscode_block_travel/blob/ba6cedc998a82d054ad499c8a96dffac4ca0aef7/package.json#L45
14-
{ "key": "shift+alt+down", "command": "editor.action.copyLinesDownAction",
15-
{ "key": "shift+alt+up", "command": "editor.action.copyLinesUpAction",
16-
"when": "editorTextFocus && !editorReadonly" },
17-
// { "key": "cmd+alt+up", "command": "block-travel.selectUp",
18-
// "when": "editorTextFocus" },
19-
// "when": "editorTextFocus && !editorReadonly" },
20-
// { "key": "alt+down", "command": "editor.action.moveLinesDownAction",
21-
{ "key": "alt+up", "command": "editor.action.moveLinesUpAction",
22-
"when": "editorTextFocus && !editorReadonly" },
23-
24-
// I removed this plugin (cause it's bad?)
25-
// non-TERRIBLE defaults for this plugin. I tried cmd+] which feels more natural
26-
// but then selection (cmd+shift+[ conflicts with tab move)
27-
// { "key": "alt+[", "command": "block-travel.jumpUp", "when": "editorTextFocus" },
28-
// { "key": "alt+]", "command": "block-travel.jumpDown", "when": "editorTextFocus" },
29-
30-
// { "key": "alt+shift+[", "command": "block-travel.selectUp", "when": "editorTextFocus" },
31-
// { "key": "alt+shift+]", "command": "block-travel.selectDown", "when": "editorTextFocus" },
32-
3312
// terrible defaults for "rails run specs"
3413
{ "key": "shift+cmd+t", "command": "workbench.action.reopenClosedEditor" },
3514
{ "key": "cmd+k cmd+f", "command": "extension.runFileSpecs" },

code/settings.json

Lines changed: 8 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,11 @@
44
"eslint.enable": true,
55
"javascript.validate.enable": false,
66
"editor.rulers": [80],
7-
"window.zoomLevel": 0,
7+
"window.zoomLevel": 1,
88
"files.exclude": {
9-
"**/.git": true, // this is a default value
10-
"**/.DS_Store": true, // this is a default value
11-
12-
"**/node_modules": true, // this excludes all folders
13-
// named "node_modules" from
14-
// the explore tree
15-
"**/dist": true,
9+
"**/.DS_Store": true,
10+
"**/.git": true,
11+
"**/node_modules": true,
1612
"**/old_dist_find_assets": true,
1713
"**/tmp": true
1814
},
@@ -22,45 +18,6 @@
2218
"workbench.editor.enablePreview": true,
2319
"workbench.editor.enablePreviewFromQuickOpen": false,
2420
"workbench.colorTheme": "rainbow",
25-
26-
// Use *[prettier-eslint](https://github.com/prettier/prettier-eslint)*
27-
// instead of *prettier*. Other settings will only be fallbacks in case they
28-
// could not be inferred from eslint rules.
29-
"prettier.eslintIntegration": false,
30-
31-
// Fit code within this line limit
32-
"prettier.printWidth": 80,
33-
34-
// Number of spaces it should use per tab
35-
"prettier.tabWidth": 4,
36-
37-
// If true, will use single instead of double quotes
38-
"prettier.singleQuote": true,
39-
40-
// Controls the printing of trailing commas wherever possible. Valid
41-
// options:
42-
// - "none" - No trailing commas
43-
// - "es5" - Trailing commas where valid in ES5 (objects, arrays, etc)
44-
// - "all" - Trailing commas wherever possible (function arguments)
45-
"prettier.trailingComma": "all",
46-
47-
// Controls the printing of spaces inside object literals
48-
"prettier.bracketSpacing": true,
49-
50-
// If true, puts the `>` of a multi-line jsx element at the end of the last
51-
// line instead of being alone on the next line
52-
"prettier.jsxBracketSameLine": false,
53-
54-
// Which parser to use. Valid options are 'flow' and 'babylon'
55-
"prettier.parser": "flow",
56-
57-
// Whether to add a semicolon at the end of every line (semi: true), or only
58-
// at the beginning of lines that may introduce ASI failures (semi: false)
59-
"prettier.semi": true,
60-
61-
// If true, indent lines with tabs
62-
"prettier.useTabs": false,
63-
6421
"indentRainbow.error_color": "",
6522

6623
"editor.renderWhitespace": "none",
@@ -76,5 +33,8 @@
7633
"window.title": "${activeEditorMedium}${separator}${rootName}",
7734
"javascript.updateImportsOnFileMove.enabled": "always",
7835
"typescript.updateImportsOnFileMove.enabled": "always",
79-
"workbench.panel.location": "bottom"
36+
"workbench.panel.location": "bottom",
37+
"breadcrumbs.enabled": true,
38+
"editor.formatOnSave": true,
39+
"editor.tabSize": 2
8040
}

0 commit comments

Comments
 (0)