Skip to content

Commit c1cfe36

Browse files
AndrewRayCodeAndrewRayCode
committed
Merge branch 'master' of github.com:AndrewRayCode/configs
2 parents 52415ca + 1ab2de4 commit c1cfe36

7 files changed

Lines changed: 107 additions & 35 deletions

File tree

‎.bash_profile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ export KEY_SUFFIX=grandrounds.com
2323

2424
#test -e "${HOME}/.iterm2_shell_integration.bash" && source "${HOME}/.iterm2_shell_integration.bash"
2525

26+
if [ -e /Users/andrewray/.nix-profile/etc/profile.d/nix.sh ]; then . /Users/andrewray/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

‎.bashrc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ dbash() {
284284

285285
deadbash() {
286286
local iid=`docker images | grep $1 | awk '{print $3}'`
287-
echo "docker run -it ${iid} /bin/bash || docker run -it ${iid} /bin/sh"
288-
docker run -it ${iid} /bin/bash || docker run -it ${iid} /bin/sh
287+
echo "docker run --rm -it ${iid} /bin/bash || docker run --rm -it ${iid} /bin/sh"
288+
docker run --rm -it ${iid} /bin/bash || docker run --rm -it ${iid} /bin/sh
289289
}
290290

291291
alias here='open .'

‎.vimrc‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,7 @@ vnoremap <silent> <Leader>t; :'.t.<cr>
316316
" in this file
317317
nnoremap Y y$
318318
319+
319320
" In command line mode use ctrl-direction to move instead of arrow keys. Super
320321
" useful.
321322
cnoremap <C-j> <t_kd>
@@ -367,8 +368,10 @@ nnoremap <Leader>ff ?^func\\|^[a-zA-Z].*func<CR>,/
367368
368369
" Faster tab switching. I never use these cause macvim lets me use
369370
" command-shift-[ which is way nicer
370-
nnoremap <C-l> gt
371-
nnoremap <C-h> gT
371+
"nnoremap <C-l> gt
372+
"nnoremap <C-h> gT
373+
374+
nnoremap <C-L> <C-w>l
372375
373376
" Mark TODO item as complete
374377
nnoremap <Leader>cp dd?❌\\|✅<cr>p0ls✅<esc><c-o>

‎code/settings.json‎

Lines changed: 40 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,15 @@
1212
"**/tmp": true
1313
},
1414
"git.autofetch": false,
15-
"editor.minimap.enabled": false,
15+
"editor.minimap.enabled": true,
1616
// NOOOOOOOO
1717
"workbench.editor.enablePreview": true,
1818
"workbench.editor.enablePreviewFromQuickOpen": false,
1919
"workbench.colorTheme": "rainbow",
2020
"editor.renderWhitespace": "none",
21+
"gitlens.advanced.messages": {
22+
"suppressShowKeyBindingsNotice": true
23+
},
2124
"window.title": "${activeEditorMedium}${separator}${rootName}",
2225
"javascript.updateImportsOnFileMove.enabled": "always",
2326
"typescript.updateImportsOnFileMove.enabled": "always",
@@ -40,6 +43,42 @@
4043
}
4144
},
4245
"workbench.sideBar.location": "left",
46+
"gitlens.menus": {
47+
"editor": {
48+
"blame": false,
49+
"clipboard": true,
50+
"compare": true,
51+
"details": false,
52+
"history": false,
53+
"remote": false
54+
},
55+
"editorGroup": {
56+
"blame": true,
57+
"compare": true
58+
},
59+
"editorTab": {
60+
"clipboard": true,
61+
"compare": true,
62+
"history": true,
63+
"remote": true
64+
},
65+
"explorer": {
66+
"clipboard": true,
67+
"compare": true,
68+
"history": true,
69+
"remote": true
70+
},
71+
"scmGroup": {
72+
"compare": true,
73+
"openClose": true,
74+
"stash": true,
75+
"stashInline": true
76+
}
77+
},
78+
"gitlens.currentLine.enabled": false,
79+
"gitlens.hovers.currentLine.over": "line",
80+
"gitlens.codeLens.enabled": false,
81+
"errorLens.gutterIconsEnabled": true,
4382
"files.autoSave": "off",
4483
"breadcrumbs.symbolPath": "off",
4584
"[javascriptreact]": {

‎code/snippets/ecmascript.code-snippets‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
{
2+
// Place your global snippets here. Each snippet is defined under a snippet name and has a scope, prefix, body and
3+
// description. Add comma separated ids of the languages where the snippet is applicable in the scope field. If scope
4+
// is left empty or omitted, the snippet gets applied to all languages. The prefix is what is
5+
// used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
6+
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders.
7+
// Placeholders with the same ids are connected.
8+
// Example:
9+
// "Print to console": {
10+
// "scope": "javascript,typescript",
11+
// "prefix": "log",
12+
// "body": [
13+
// "console.log('$1');",
14+
// "$2"
15+
// ],
16+
// "description": "Log output to console"
17+
// }
18+
"Console Log": {
19+
"scope": "javascript,typescript",
20+
"prefix": "c",
21+
"body": [
22+
"console.log($1)",
23+
],
24+
"description": "Console log string"
25+
},
26+
"Console Log String": {
27+
"scope": "javascript,typescript",
28+
"prefix": "c'",
29+
"body": [
30+
"console.log('$1')",
31+
],
32+
"description": "Console log string"
33+
},
34+
"Console Log Descriptor Then Thing": {
35+
"scope": "javascript,typescript",
36+
"prefix": "ct",
37+
"body": [
38+
"console.log('$1 ${2}', ${2})",
39+
],
40+
"description": "Console log descriptor then thing"
41+
},
42+
"Console Log value name and value": {
43+
"scope": "javascript,typescript",
44+
"prefix": "c,",
45+
"body": [
46+
"console.log('$1', ${1})",
47+
],
48+
"description": "Console log value name and value"
49+
},
50+
"Console Log Emoji 🔥": {
51+
"scope": "javascript,typescript",
52+
"prefix": "cc",
53+
"body": [
54+
"console.log('${1|🔥,❌,🚽,🌿,💙|}$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1')"
55+
],
56+
"description": "Make console output noticable"
57+
}
58+
}

‎code/snippets/javascript.json‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
{
2-
32
// Place your snippets for JavaScript here. Each snippet is defined under a snippet name and has a prefix, body and
43
// description. The prefix is what is used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
54
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the
@@ -15,34 +14,6 @@
1514
],
1615
"description": "For Loop"
1716
},
18-
"Console Log": {
19-
"prefix": "c",
20-
"body": [
21-
"console.log($1)",
22-
],
23-
"description": "Console log string"
24-
},
25-
"Console Log Text": {
26-
"prefix": "c'",
27-
"body": [
28-
"console.log('$1')",
29-
],
30-
"description": "Console log text"
31-
},
32-
"Console Log String": {
33-
"prefix": "c,",
34-
"body": [
35-
"console.log('$1', ${1})",
36-
],
37-
"description": "Console log string"
38-
},
39-
"Console Log Emoji 🔥": {
40-
"prefix": "cc",
41-
"body": [
42-
"console.log('${1|🔥,❌,🚽,🌿,💙|}$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1$1')"
43-
],
44-
"description": "Make console output noticable"
45-
},
4617
"React Constructor": {
4718
"prefix": "rc",
4819
"body": [

‎install.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@ if [[ -d "$vsCodeDir" ]]; then
9797
# putting these here for easy working with later
9898
#ln -fs /Users/andrewray/configs/code/settings.json /Users/andrewray/Library/Application\ Support/Code/User/
9999
#ln -fs /Users/andrewray/configs/code/snippets/javascript.json "/Users/andrewray/Library/Application Support/Code/User/snippets/javascript.json"
100+
#ln -fs /Users/andrewray/configs/code/snippets/ecmascript.code-snippets.json "/Users/andrewray/Library/Application Support/Code/User/snippets/ecmascript.code-snippets.json"
100101

101102
let "symlinks+=1"
102103
fi
@@ -165,5 +166,4 @@ git config --global core.editor /usr/local/bin/vim
165166
#sudo ./.osx
166167
echo $COLOR_RESET
167168

168-
# Toilets!
169169
echo $COLOR_GREEN"Done!"$COLOR_LIGHT_GREEN $symlinks$COLOR_GREEN symlinks were created.$COLOR_RESET

0 commit comments

Comments
 (0)