Skip to content

Commit 794cc32

Browse files
committed
wtf zoom level
2 parents 135d985 + 6a36f56 commit 794cc32

3 files changed

Lines changed: 69 additions & 23 deletions

File tree

.bashrc

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,15 @@ function alert() {
102102
if [[ -z "$message" ]]; then
103103
message='Completed'
104104
fi
105-
osascript -e "display notification \"${message}\" with title \"${message}\""
105+
toast $1
106106
say -v Bells ${message}
107107
}
108108

109+
function toast() {
110+
message=$1
111+
osascript -e "display notification \"${message}\" with title \"${message}\""
112+
}
113+
109114
# make sound good
110115
function ding() {
111116
afplay /System/Library/Sounds/Glass.aiff

.vimrc

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1474,27 +1474,27 @@ let g:project_use_nerdtree = 1
14741474
" default starting path (the home directory)
14751475
call project#rc("~/")
14761476

1477-
Project '~/fq' , 'fq'
1478-
Project '~/shader-studio' , 'shader-studio'
1479-
Project '~/runtime-shaderfrog' , 'shaderfrog-runtime'
1480-
Project '~/doopy-butts' , 'doopy-butts'
1481-
Project '~/cats-react' , 'cats-react'
1482-
Project '~/big-bubble' , 'bubble'
1483-
Project '~/glsl2js' , 'parser'
1484-
Project '~/mood-engine' , 'mood engine'
1485-
Project '~/blog' , 'blog'
1486-
Project '~/blag' , 'blag'
1487-
Project '~/dev' , 'gr-dev'
1488-
Project '~/dev/engineering' , 'gr-engineering'
1489-
Project '~/dev/brizo' , 'gr-brizo'
1490-
Project '~/dev/tp' , 'tp'
1491-
Project '~/dev/monger-cordova' , 'monger-cordova'
1492-
Project '~/dev/jarvis' , 'jarvis'
1493-
Project '~/dev/devise-two-factor/demo' , 'devise-two-factor-demo'
1494-
Project '~/workerbee/OpusWeb/mvp_webpack', 'bee site'
1495-
Project '~/rails-tutorial' , 'rails tutorial'
1496-
Project '~/dev/onboarding-tech-notes' , 'onboarding tech notes'
1497-
Project '~/closed-source-projects' , 'closed source projects'
1477+
Project '~/ray/fq' , 'fq'
1478+
Project '~/ray/shader-studio' , 'shader-studio'
1479+
Project '~/ray/runtime-shaderfrog' , 'shaderfrog-runtime'
1480+
Project '~/ray/doopy-butts' , 'doopy-butts'
1481+
Project '~/ray/cats-react' , 'cats-react'
1482+
Project '~/ray/big-bubble' , 'bubble'
1483+
Project '~/ray/glsl2js' , 'parser'
1484+
Project '~/ray/mood-engine' , 'mood engine'
1485+
Project '~/ray/blog' , 'blog'
1486+
Project '~/ray/blag' , 'blag'
1487+
Project '~/ray/dev' , 'gr-dev'
1488+
Project '~/ray/dev/engineering' , 'gr-engineering'
1489+
Project '~/ray/dev/brizo' , 'gr-brizo'
1490+
Project '~/ray/dev/tp' , 'tp'
1491+
Project '~/ray/dev/monger-cordova' , 'monger-cordova'
1492+
Project '~/ray/dev/jarvis' , 'jarvis'
1493+
Project '~/ray/dev/devise-two-factor/demo' , 'devise-two-factor-demo'
1494+
Project '~/ray/workerbee/OpusWeb/mvp_webpack', 'bee site'
1495+
Project '~/ray/rails-tutorial' , 'rails tutorial'
1496+
Project '~/ray/dev/onboarding-tech-notes' , 'onboarding tech notes'
1497+
Project '~/ray/closed-source-projects' , 'closed source projects'
14981498

14991499
"------------------------------------------------------------------------------
15001500
" Script-runner (I don't really use this anymore)

code/settings.json

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
"editor.rulers": [
66
80
77
],
8+
"window.zoomLevel": 1,
89
"files.exclude": {
910
"**/.DS_Store": true,
1011
"**/.git": true,
@@ -30,6 +31,10 @@
3031
"editor.formatOnSave": true,
3132
"editor.defaultFormatter": "esbenp.prettier-vscode"
3233
},
34+
// not ready for prime time
35+
// "[pegjs]": {
36+
// "editor.defaultFormatter": "esbenp.prettier-vscode"
37+
// },
3338
"editor.tabSize": 2,
3439
"editor.tabCompletion": "on",
3540
"editor.snippetSuggestions": "top",
@@ -109,6 +114,7 @@
109114
}
110115
],
111116
"terminal.integrated.inheritEnv": false,
117+
<<<<<<< HEAD
112118
"salesforcedx-vscode-core.telemetry.enabled": false,
113119
"workbench.editor.wrapTabs": true,
114120
"workbench.editor.decorations.badges": true,
@@ -122,4 +128,39 @@
122128
"filenamePattern": "*.ipynb"
123129
}
124130
]
125-
}
131+
}
132+
||||||| bc09cba
133+
"salesforcedx-vscode-core.telemetry.enabled": false
134+
}
135+
=======
136+
"salesforcedx-vscode-core.telemetry.enabled": false,
137+
138+
"vim.easymotion": true,
139+
"vim.incsearch": true,
140+
"vim.useSystemClipboard": false,
141+
"vim.useCtrlKeys": true,
142+
"vim.hlsearch": true,
143+
"vim.insertModeKeyBindings": [
144+
{
145+
"before": ["j", "j"],
146+
"after": ["<Esc>"]
147+
}
148+
],
149+
"vim.normalModeKeyBindingsNonRecursive": [
150+
{
151+
"before": ["<leader>", "d"],
152+
"after": ["d", "d"]
153+
},
154+
{
155+
"before": ["<C-n>"],
156+
"commands": [":nohl"]
157+
}
158+
],
159+
"vim.leader": "<space>",
160+
"vim.handleKeys": {
161+
"<C-a>": false,
162+
"<C-f>": false
163+
},
164+
"vim.smartRelativeLine": true
165+
}
166+
>>>>>>> 6a36f56087b79f22a29182485b43ca1f601403ca

0 commit comments

Comments
 (0)