Skip to content

Commit 02973ee

Browse files
AndrewRayCodeAndrewRayCode
committed
Merge branch 'master' of github.com:AndrewRayCode/configs
2 parents dc8a6ca + 6c6175c commit 02973ee

9 files changed

Lines changed: 5188 additions & 175 deletions

File tree

‎.bashrc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1072,3 +1072,6 @@ alias gx="git ls-files -m --exclude-standard | fzf --print0 -m --preview 'git di
10721072
# Terible horrible garbage for mysql 5.6 for local service
10731073
pathadd "/usr/local/opt/[email protected]/bin"
10741074

1075+
alias dcr='docker-compose run'
1076+
alias dce='docker-compose exec'
1077+

‎.inputrc‎

Lines changed: 1 addition & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,5 @@
11
# base-files version 3.9-3
22

3-
# To pick up the latest recommended .inputrc content,
4-
# look in /etc/defaults/etc/skel/.inputrc
5-
6-
# Modifying /etc/skel/.inputrc directly will prevent
7-
# setup from updating it.
8-
9-
# The copy in your home directory (~/.inputrc) is yours, please
10-
# feel free to customise it to create a shell
11-
# environment to your liking. If you feel a change
12-
# would be benifitial to all, please feel free to send
13-
# a patch to the cygwin mailing list.
14-
153
# Bind the up arrow to history search, instead of history step
164
"\e[A": history-search-backward
175
# And the reverse (down)
@@ -37,39 +25,7 @@
3725
"\eOH": beginning-of-line
3826
"\eOF": end-of-line
3927

40-
# Allow 8-bit input/output
41-
#set meta-flag on
42-
#set convert-meta off
43-
#set input-meta on
44-
#set output-meta on
45-
#$if Bash
46-
# Don't ring bell on completion
47-
#set bell-style none
48-
49-
# or, don't beep at me - show me
50-
#set bell-style visible
51-
52-
# Filename completion/expansion
53-
#set completion-ignore-case on
54-
#set show-all-if-ambiguous on
55-
56-
# Expand homedir name
57-
#set expand-tilde on
58-
59-
# Append "/" to all dirnames
60-
#set mark-directories on
61-
#set mark-symlinked-directories on
62-
63-
# Match all files
64-
#set match-hidden-files on
65-
66-
# 'Magic Space'
67-
# Insert a space character then performs
68-
# a history expansion in the line
69-
#Space: magic-space
70-
#$endif
71-
72-
#if you don't like the annoying end-of-line beeps:
28+
# Stoppy beepy
7329
set bell-style none
7430

7531
# to show all characters like å
@@ -78,8 +34,6 @@ set input-meta On
7834
set output-meta On
7935
set convert-meta Off
8036

81-
"\C-v": paste-from-clipboard
82-
8337
# Vim mode in bash with cursor improvements. Zsh has different instructions
8438
# First upgrade to Bash 4 on OSX http://clubmate.fi/upgrade-to-bash-4-in-mac-os-x/
8539
# Then add the following lines to your ~/.inputrc:

‎.vscode/settings.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"workbench.colorCustomizations": {
3+
"titleBar.activeForeground": "#fff",
4+
"titleBar.activeBackground": "#1f6700"
5+
},
6+
"window.title": "🤟🏻 ${activeEditorShort}${separator} Configs"
7+
}

‎_vimrc‎

Lines changed: 0 additions & 47 deletions
This file was deleted.

‎code/keybindings.json‎

Lines changed: 100 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,19 @@
1-
// Place your key bindings in this file to overwrite the defaults
21
[
3-
// Vim navigate backwards/forwards
2+
/**
3+
* ----------------------------------------------------------------------------
4+
* General keybindings
5+
* ----------------------------------------------------------------------------
6+
*/
7+
// Attempt to open workspace settings.json
48
{
5-
"key": "ctrl+o",
6-
"command": "workbench.action.navigateBack",
7-
"when": "editorTextFocus"
9+
"key": "cmd-,",
10+
"command": "workbench.action.openSettingsJson"
811
},
912
{
10-
"key": "ctrl+i",
11-
"command": "workbench.action.navigateForward",
12-
"when": "editorTextFocus"
13+
"key": "cmd-k cmd-,",
14+
"command": "macros.openWorkspaceSettingsJSON"
1315
},
14-
{
15-
"key": "cmd+k p",
16-
"command": "extension.copyRelativePathOfActiveFile",
17-
"when": "editorTextFocus"
18-
},
19-
{
20-
"key": "cmd+k f",
21-
"command": "workbench.action.files.copyPathOfActiveFile",
22-
"when": "editorTextFocus"
23-
},
24-
{
25-
"key": "cmd-k l",
26-
"command": "latex-workshop.tab",
27-
"when": "editorTextFocus"
28-
},
29-
{
30-
"key": "cmd-alt-m",
31-
"command": "workbench.action.terminal.focus"
32-
},
33-
{
34-
"key": "cmd-alt-m",
35-
"command": "workbench.action.terminal.focus"
36-
},
37-
{
38-
"key": "cmd-shift-b",
39-
"command": "editor.action.revealDefinition",
40-
"when": "editorHasDefinitionProvider && editorTextFocus && !isInEmbeddedEditor"
41-
},
42-
// terrible defaults for "rails run specs"
43-
{
44-
"key": "shift+cmd+t",
45-
"command": "workbench.action.reopenClosedEditor"
46-
},
47-
{
48-
"key": "cmd+k cmd+f",
49-
"command": "extension.runFileSpecs",
50-
"when": "editorTextFocus"
51-
},
52-
// Open keybindings.json file, since there's no default shortcut for it (LOL)
16+
// Open keyboard shortcuts
5317
{
5418
"key": "cmd+k cmd+k",
5519
"command": "workbench.action.openGlobalKeybindingsFile"
@@ -59,16 +23,6 @@
5923
"key": "cmd+k cmd+n",
6024
"command": "macros.clearOutputAndNotifications"
6125
},
62-
// Rerun last apex test class
63-
{
64-
"key": "cmd+k cmd+x",
65-
"command": "macros.runLastApexTestClass"
66-
},
67-
// Rerun last apex test
68-
{
69-
"key": "cmd+k cmd+t",
70-
"command": "macros.runLastApexTestMethod"
71-
},
7226
// Jump between change history
7327
{
7428
"key": "cmd+]",
@@ -113,5 +67,94 @@
11367
{
11468
"key": "cmd+8",
11569
"command": "workbench.action.openEditorAtIndex8"
70+
},
71+
/**
72+
* ----------------------------------------------------------------------------
73+
* Vim Helpers
74+
* ----------------------------------------------------------------------------
75+
*/
76+
// Vim navigate backwards/forwards
77+
{
78+
"key": "ctrl+o",
79+
"command": "workbench.action.navigateBack",
80+
"when": "editorTextFocus"
81+
},
82+
{
83+
"key": "ctrl+i",
84+
"command": "workbench.action.navigateForward",
85+
"when": "editorTextFocus"
86+
},
87+
/**
88+
* ----------------------------------------------------------------------------
89+
* File Helpers
90+
* ----------------------------------------------------------------------------
91+
*/
92+
{
93+
"key": "cmd+k p",
94+
"command": "extension.copyRelativePathOfActiveFile",
95+
"when": "editorTextFocus"
96+
},
97+
{
98+
"key": "cmd+k f",
99+
"command": "workbench.action.files.copyPathOfActiveFile",
100+
"when": "editorTextFocus"
101+
},
102+
/**
103+
* ----------------------------------------------------------------------------
104+
* Terminal Helpers
105+
* ----------------------------------------------------------------------------
106+
*/
107+
{
108+
"key": "cmd-alt-m",
109+
"command": "workbench.action.terminal.focus"
110+
},
111+
{
112+
"key": "cmd-alt-m",
113+
"command": "workbench.action.terminal.focus"
114+
},
115+
{
116+
"key": "cmd-shift-b",
117+
"command": "editor.action.revealDefinition",
118+
"when": "editorHasDefinitionProvider && editorTextFocus && !isInEmbeddedEditor"
119+
},
120+
/**
121+
* ----------------------------------------------------------------------------
122+
* Rspec Helpers
123+
* ----------------------------------------------------------------------------
124+
*/
125+
// terrible defaults for "rails run specs"
126+
{
127+
"key": "shift+cmd+t",
128+
"command": "workbench.action.reopenClosedEditor"
129+
},
130+
{
131+
"key": "cmd+k cmd+f",
132+
"command": "extension.runFileSpecs",
133+
"when": "editorTextFocus"
134+
},
135+
/**
136+
* ----------------------------------------------------------------------------
137+
* Apex Helpers
138+
* ----------------------------------------------------------------------------
139+
*/
140+
// Rerun last apex test class
141+
{
142+
"key": "cmd+k cmd+x",
143+
"command": "macros.runLastApexTestClass"
144+
},
145+
// Rerun last apex test
146+
{
147+
"key": "cmd+k cmd+t",
148+
"command": "macros.runLastApexTestMethod"
149+
},
150+
/**
151+
* ----------------------------------------------------------------------------
152+
* What is this?
153+
* ----------------------------------------------------------------------------
154+
*/
155+
{
156+
"key": "cmd-k l",
157+
"command": "latex-workshop.tab",
158+
"when": "editorTextFocus"
116159
}
117160
]

‎code/settings.json‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22
{
33
"eslint.enable": true,
44
"javascript.validate.enable": false,
5-
"editor.rulers": [80],
5+
"editor.rulers": [
6+
80
7+
],
68
"window.zoomLevel": 1,
79
"files.exclude": {
810
"**/.DS_Store": true,
@@ -89,5 +91,12 @@
8991
"editor.defaultFormatter": "esbenp.prettier-vscode"
9092
},
9193
"editor.formatOnSave": true,
92-
"editor.multiCursorModifier": "ctrlCmd"
93-
}
94+
"editor.multiCursorModifier": "ctrlCmd",
95+
"macros": {
96+
"openWorkspaceSettingsJSON": [
97+
"workbench.action.openWorkspaceSettings",
98+
"workbench.action.openWorkspaceSettings",
99+
"settings.switchToJSON"
100+
]
101+
}
102+
}

0 commit comments

Comments
 (0)