Skip to content

Commit 9bbc4b1

Browse files
lgolgo
committed
checkpoint
1 parent ceea52d commit 9bbc4b1

File tree

15 files changed

+205
-53
lines changed

15 files changed

+205
-53
lines changed

‎editors/vim/.vimrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ Plug 'tpope/vim-fugitive'
4444
Plug 'Lokaltog/vim-easymotion'
4545
"the sparkup vim script is in a subdirectory, so pass the proper one in
4646
Plug 'rstacruz/sparkup', {'rpt': 'vim/'}
47-
Plug 'tpope/vim-rails.git'
4847

4948
"vim-scripts repos
5049
Plug 'vim-scripts/L9'

‎editors/vscode/keybindings.json‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,14 @@
102102
"key": "cmd+r",
103103
"command": "-workbench.action.reloadWindow",
104104
"when": "isDevelopment"
105+
},
106+
{
107+
"key": "shift+cmd+l",
108+
"command": "-aichat.insertselectionintochat"
109+
},
110+
{
111+
"key": "shift+cmd+l",
112+
"command": "-addCursorsAtSearchResults",
113+
"when": "fileMatchOrMatchFocus && searchViewletVisible"
105114
}
106115
]

‎editors/vscode/settings.json‎

Lines changed: 154 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,8 @@
4343
"**/.ammonite": true
4444
},
4545
"files.useExperimentalFileWatcher": true,
46-
"workbench.activityBar.visible": true,
4746
"workbench.statusBar.visible": true,
48-
"editor.rulers": [
49-
80
50-
],
47+
"editor.rulers": [80],
5148
"editor.minimap.enabled": false,
5249
"git.autofetch": true,
5350
"workbench.sideBar.location": "left",
@@ -72,6 +69,9 @@
7269
"[bazel]": {
7370
"editor.formatOnSave": false
7471
},
72+
"[python]": {
73+
"editor.formatOnSave": true
74+
},
7575
"go.formatTool": "goimports",
7676
"clangd.path": "/usr/local/opt/llvm@8/bin/clangd",
7777
"workbench.editor.enablePreviewFromQuickOpen": false,
@@ -88,7 +88,9 @@
8888
"vs-kubernetes.draft-path.mac": "/Users/joey/.vs-kubernetes/tools/draft/darwin-amd64/draft",
8989
"vscode-kubernetes.helm-path.mac": "/Users/joey/.vs-kubernetes/tools/helm/darwin-amd64/helm",
9090
"vscode-kubernetes.kubectl-path.mac": "/Users/joey/.vs-kubernetes/tools/kubectl/kubectl",
91-
"vscode-kubernetes.minikube-path.mac": "/Users/joey/.vs-kubernetes/tools/minikube/darwin-amd64/minikube"
91+
"vscode-kubernetes.minikube-path.mac": "/Users/joey/.vs-kubernetes/tools/minikube/darwin-amd64/minikube",
92+
"vscode-kubernetes.minikube-path-mac": "/Users/joey/.vs-kubernetes/tools/minikube/darwin-amd64/minikube",
93+
"vs-kubernetes.crd-code-completion": "enabled"
9294
},
9395
// This ensures all new tabs are persistent, getting rid of the default behavior
9496
// where new tabs are in italics and can be replaced by the next new file you open.
@@ -100,29 +102,47 @@
100102
"vsicons.dontShowNewVersionMessage": true,
101103
"editor.renderWhitespace": "boundary",
102104
"cSpell.userWords": [
105+
"autokuma",
106+
"Beelink",
103107
"Cutover",
108+
"dataset",
109+
"deduplicated",
104110
"Deduplicator",
105111
"Denorm",
112+
"denormalized",
113+
"diffable",
114+
"dockerproxy",
115+
"eques",
106116
"Flink",
117+
"Gitea",
118+
"herokuapp",
119+
"iamckn",
120+
"infisical",
121+
"Klipper",
107122
"Kryo",
123+
"kuma",
108124
"Lookback",
125+
"mosquitto",
126+
"pereira",
127+
"pizzly",
128+
"privs",
129+
"pymongo",
130+
"qtree",
131+
"realtimeapi",
109132
"Rollup",
110133
"Rollups",
111134
"Semigroup",
112135
"Serde",
113136
"Serializer",
114137
"Serializers",
115-
"Stateful",
116-
"dataset",
117-
"deduplicated",
118-
"denormalized",
119-
"diffable",
120-
"herokuapp",
121-
"pereira",
122-
"pizzly",
123-
"qtree",
138+
"servarr",
124139
"splitwise",
140+
"Stateful",
125141
"struct",
142+
"tailscale",
143+
"traefik",
144+
"unhexlify",
145+
"yedit",
126146
"ynab",
127147
"youneedabudget"
128148
],
@@ -137,16 +157,11 @@
137157
"enabled": false,
138158
"liveIndexing": false,
139159
"delay": 500,
140-
"exclude": [
141-
".terraform/**/*",
142-
"**/.terraform/**/*"
143-
]
160+
"exclude": [".terraform/**/*", "**/.terraform/**/*"]
144161
},
145162
"terraform.languageServer": {
146163
"external": true,
147-
"args": [
148-
"serve"
149-
]
164+
"args": ["serve"]
150165
},
151166
"java.semanticHighlighting.enabled": true,
152167
"java.requirements.JDK11Warning": false,
@@ -159,15 +174,15 @@
159174
"window.title": "${rootName}${separator}${activeEditorMedium}",
160175
"workbench.editorAssociations": [
161176
{
162-
"viewType": "jupyter.notebook.ipynb",
177+
"viewType": "jupyter-notebook",
163178
"filenamePattern": "*.ipynb"
164179
}
165180
],
166181
"editor.tabSize": 2,
167-
"python.languageServer": "Microsoft",
182+
"python.languageServer": "Default",
168183
"update.mode": "none",
169184
"go.toolsManagement.autoUpdate": true,
170-
"workbench.colorTheme": "Default Light+",
185+
"workbench.colorTheme": "Spinel",
171186
"mssql.connections": [
172187
{
173188
"server": "{{put-server-name-here}}",
@@ -178,4 +193,119 @@
178193
],
179194
"C_Cpp.intelliSenseEngine": "Disabled",
180195
"jestrunner.jestCommand": "yarn test",
196+
"[typescript]": {
197+
"editor.defaultFormatter": "vscode.typescript-language-features"
198+
},
199+
"bracketPairColorizer.depreciation-notice": false,
200+
"cSpell.language": "en,en-GB",
201+
"sonarlint.rules": {
202+
"python:S5542": {
203+
"level": "off"
204+
},
205+
"kubernetes:S6873": {
206+
"level": "off"
207+
},
208+
"kubernetes:S6892": {
209+
"level": "off"
210+
},
211+
"kubernetes:S6864": {
212+
"level": "off"
213+
},
214+
"kubernetes:S6870": {
215+
"level": "off"
216+
},
217+
"kubernetes:S6897": {
218+
"level": "off"
219+
},
220+
"kubernetes:S6596": {
221+
"level": "off"
222+
}
223+
},
224+
"ruby.pathToBundler": "bundle",
225+
"ruby.useBundler": true,
226+
"ruby.rubocop.useBundler": true,
227+
"sorbet.enabled": true,
228+
"sorbet.lspConfigs": [
229+
{
230+
"id": "stable",
231+
"name": "Sorbet",
232+
"description": "Stable Sorbet Ruby IDE features",
233+
"cwd": "${workspaceFolder}",
234+
"command": ["bundle", "exec", "srb", "typecheck", "--lsp"]
235+
},
236+
{
237+
"id": "beta",
238+
"name": "Sorbet (Beta)",
239+
"description": "Beta Sorbet Ruby IDE features",
240+
"cwd": "${workspaceFolder}",
241+
"command": [
242+
"bundle",
243+
"exec",
244+
"srb",
245+
"typecheck",
246+
"--lsp",
247+
"--enable-all-beta-lsp-features"
248+
]
249+
},
250+
{
251+
"id": "experimental",
252+
"name": "Sorbet (Experimental)",
253+
"description": "Experimental Sorbet Ruby IDE features (warning: crashy, for developers only)",
254+
"cwd": "${workspaceFolder}",
255+
"command": [
256+
"bundle",
257+
"exec",
258+
"srb",
259+
"typecheck",
260+
"--lsp",
261+
"--enable-all-experimental-lsp-features"
262+
]
263+
}
264+
],
265+
"[markdown]": {
266+
"editor.defaultFormatter": "esbenp.prettier-vscode"
267+
},
268+
"[jsonc]": {
269+
"editor.defaultFormatter": "esbenp.prettier-vscode"
270+
},
271+
"redhat.telemetry.enabled": true,
272+
"python.pythonPath": "/usr/local/bin/python3",
273+
"sorbet.highlightUntyped": true,
274+
// "sorbet.selectedLspConfigId": "stable-local",
275+
// "sorbet.userLspConfigs": [
276+
// {
277+
// "id": "stable-local",
278+
// "name": "Sorbet",
279+
// "description": "Stable Sorbet Ruby IDE features",
280+
// "cwd": "${workspaceFolder}",
281+
// "command": [
282+
// "${workspaceFolder}/bin/bundle",
283+
// "exec",
284+
// "srb",
285+
// "typecheck",
286+
// "--lsp"
287+
// ]
288+
// }
289+
// ],
290+
"rubyLsp.rubyVersionManager": {
291+
"identifier": "none"
292+
},
293+
"[ruby]": {
294+
"editor.defaultFormatter": "Shopify.ruby-lsp",
295+
"editor.insertSpaces": true,
296+
"files.trimTrailingWhitespace": true,
297+
"files.insertFinalNewline": true,
298+
"files.trimFinalNewlines": true,
299+
"editor.rulers": [120],
300+
"editor.semanticHighlighting.enabled": true,
301+
"editor.formatOnSave": true,
302+
"editor.formatOnType": true,
303+
"editor.tabSize": 2
304+
},
305+
"[typescriptreact]": {
306+
"editor.defaultFormatter": "vscode.typescript-language-features"
307+
},
308+
"github.copilot.editor.enableAutoCompletions": true
309+
// "rubyLsp.rubyVersionManager": "custom",
310+
// "rubyLsp.customRubyCommand": "export PATH=\"/usr/local/opt/ruby/bin:$PATH\""
181311
}

‎iterm/preferences/com.googlecode.iterm2.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2096,7 +2096,7 @@
20962096
<key>SeparateStatusBarsPerPane</key>
20972097
<true/>
20982098
<key>ShowFullScreenTabBar</key>
2099-
<true/>
2099+
<false/>
21002100
<key>SoundForEsc</key>
21012101
<false/>
21022102
<key>SplitPaneDimmingAmount</key>

‎macos/spectacle/Shortcuts.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"shortcut_name" : "MakeSmaller"
99
},
1010
{
11-
"shortcut_key_binding" : "ctrl+cmd+left",
12-
"shortcut_name" : "MoveToUpperLeft"
11+
"shortcut_key_binding" : "ctrl+alt+left",
12+
"shortcut_name" : "MoveToPreviousThird"
1313
},
1414
{
1515
"shortcut_key_binding" : "ctrl+cmd+right",
@@ -63,12 +63,12 @@
6363
"shortcut_key_binding" : "alt+cmd+right",
6464
"shortcut_name" : "MoveToRightHalf"
6565
},
66-
{
67-
"shortcut_key_binding" : "ctrl+alt+left",
68-
"shortcut_name" : "MoveToPreviousThird"
69-
},
7066
{
7167
"shortcut_key_binding" : "ctrl+shift+cmd+right",
7268
"shortcut_name" : "MoveToLowerRight"
69+
},
70+
{
71+
"shortcut_key_binding" : "ctrl+cmd+left",
72+
"shortcut_name" : "MoveToUpperLeft"
7373
}
7474
]

‎zsh/.bash_profile‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
# NB: This file should be empty, but is in git to monitor any changes.
2-
#
3-
# Any additions should be split out to the appropriate sub-files.
1+
# NB: This file should be empty, but is in git to monitor any changes.

‎zsh/.bashrc‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1 @@
1-
# NB: This file should be empty, but is in git to monitor any changes.
2-
#
3-
# Any additions should be split out to the appropriate sub-files.
1+
# NB: This file should be empty, but is in git to monitor any changes.

‎zsh/.zlogin‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,6 @@ for file in ${login_files}; do
1313
done
1414

1515
unset login_files
16-
unsetopt nullglob
16+
unsetopt nullglob
17+
18+
# [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" # Load RVM into a shell session *as a function*

‎zsh/.zprofile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,6 @@ done
2121
unset profile_files path_files fpath_files env_files
2222
unsetopt nullglob
2323

24-
export PATH="$HOME/.cargo/bin:$PATH"
24+
# Continue to source bash files so that if something adds a configuration to
25+
# them, it will work without first editing files.
26+
source ~/.bash_profile

‎zsh/.zshrc‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ autoload -Uz bashcompinit; bashcompinit -u
4444

4545
# Continue to source bash files so that if something adds a configuration to
4646
# them, it will work without first editing files.
47-
source ~/.bash_profile
4847
source ~/.bashrc
4948

5049
_evalcache nodenv init -

0 commit comments

Comments
 (0)