this repo has no description
Fix up merge with work VSCode settings
+539
-396
+12
-1
.config/fish/config.fish
+12
-1
.config/fish/config.fish
···
1
+
# Set fish_user_paths here instead of fish_variables to expand $HOME per-machine
2
+
set -U fish_user_paths
3
+
4
+
if command -qs npm
5
+
set -Ua fish_user_paths (npm bin)
6
+
end
7
+
8
+
set -Ua fish_user_paths ~/.cargo/bin ~/.pyenv/shims /usr/local/Cellar/pyenv-virtualenv/*/shims
9
+
1
10
if not set -q DOCKER_NAME; and test -f /etc/profile.d/docker_name.sh
2
11
set -gx DOCKER_NAME (sed -E 's/.*DOCKER_NAME=(.+)/\1/' /etc/profile.d/docker_name.sh)
3
12
end
4
13
5
14
if status is-interactive; and status is-login
6
-
command -sq thefuck; and source (thefuck --alias | psub)
15
+
if command -qs thefuck
16
+
source (thefuck --alias | psub)
17
+
end
7
18
8
19
if command -qs pyenv
9
20
source (pyenv init - | psub)
+1
.config/yadm/bootstrap
+1
.config/yadm/bootstrap
+51
-1
.emacs.d/.gitignore
+51
-1
.emacs.d/.gitignore
···
1
-
auto-save-list/
1
+
# -*- mode: gitignore; -*-
2
+
3
+
# Taken from https://github.com/github/gitignore/blob/master/Global/Emacs.gitignore
4
+
*~
5
+
\#*\#
6
+
/.emacs.desktop
7
+
/.emacs.desktop.lock
8
+
*.elc
9
+
auto-save-list
10
+
tramp
11
+
.\#*
12
+
13
+
# Org-mode
14
+
.org-id-locations
15
+
*_archive
16
+
17
+
# flymake-mode
18
+
*_flymake.*
19
+
20
+
# eshell files
21
+
/eshell/history
22
+
/eshell/lastdir
23
+
24
+
# elpa packages
25
+
/elpa/
26
+
27
+
# reftex files
28
+
*.rel
29
+
30
+
# AUCTeX auto folder
31
+
/auto/
32
+
33
+
# cask packages
34
+
.cask/
35
+
dist/
36
+
37
+
# Flycheck
38
+
flycheck_*.el
39
+
40
+
# server auth directory
41
+
/server/
42
+
43
+
# projectiles files
44
+
.projectile
45
+
46
+
# directory configuration
47
+
.dir-locals.el
48
+
49
+
# network security
50
+
/network-security.data
51
+
+101
-20
.emacs.d/init.el
+101
-20
.emacs.d/init.el
···
11
11
;; (add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t)
12
12
;; Comment/uncomment this line to enable MELPA Stable if desired. See `package-archive-priorities`
13
13
;; and `package-pinned-packages`. Most users will not need or want to do this.
14
-
(add-to-list 'package-archives (cons "melpa-stable" (concat proto "://stable.melpa.org/packages/")) t)
15
-
)
14
+
(add-to-list 'package-archives (cons "melpa-stable" (concat proto "://stable.melpa.org/packages/")) t))
16
15
17
16
;; Added by Package.el. This must come before configurations of
18
17
;; installed packages. Don't delete this line. If you don't want it,
···
26
25
;; Your init file should contain only one such instance.
27
26
;; If there is more than one, they won't work right.
28
27
'(fill-column 88)
28
+
'(evil-vsplit-window-right t)
29
+
'(hl-todo-color-background t)
30
+
'(hl-todo-keyword-faces
31
+
(quote
32
+
(("TODO" . "#FFEB3B")
33
+
("NOTE" . "#FFEB3B")
34
+
("FIXME" . "#FFEB3B"))))
35
+
'(inhibit-startup-screen t)
36
+
'(org-agenda-custom-commands
37
+
(quote
38
+
(("n" "Agenda and all TODOs"
39
+
((agenda "" nil)
40
+
(alltodo "" nil))
41
+
nil)
42
+
("w" "Weekend Agenda and TODOs" agenda ""
43
+
((org-agenda-overriding-header "WEEKEND")
44
+
(org-agenda-span
45
+
(quote 2))
46
+
(org-agenda-start-day "saturday")
47
+
(org-read-date-prefer-future nil)))
48
+
("3" "3-day Agenda and TODOs" agenda ""
49
+
((org-agenda-overriding-header "3 DAY VIEW")
50
+
(org-agenda-span
51
+
(quote 3))
52
+
(org-agenda-start-day "today"))))))
53
+
'(org-agenda-files (quote ("~/Documents/notes/")))
54
+
'(org-agenda-restore-windows-after-quit t)
55
+
'(org-agenda-todo-list-sublevels t)
56
+
'(org-agenda-window-setup (quote current-window))
57
+
'(org-indirect-buffer-display (quote current-window))
29
58
'(org-todo-keywords (quote ((sequence "TODO" "PROG" "DONE"))))
59
+
'(org-use-property-inheritance (quote ("DEADLINE" "SCHEDULED")))
30
60
'(package-selected-packages
31
61
(quote
32
62
(hl-todo evil-collection monokai-theme evil-org evil ##)))
63
+
'(show-paren-mode t)
33
64
'(split-height-threshold nil))
34
65
(custom-set-faces
35
66
;; custom-set-faces was added by Custom.
···
45
76
;; ----------------------------------------------------------------------
46
77
;; Package/Theme configuration
47
78
;; ----------------------------------------------------------------------
79
+
;; Directory for non-package (require) calls
80
+
(add-to-list 'load-path "~/.emacs.d/lisp/")
81
+
48
82
(require 'evil)
49
83
(evil-mode 1)
50
84
51
-
;; TODO: bindings for customize-mode
52
-
85
+
;; TODO: evil-collection bindings for customize-mode
53
86
;; (when (require 'evil-collection nil t)
54
87
;; (evil-collection-init))
55
88
···
60
93
(require 'evil-org-agenda)
61
94
(evil-org-agenda-set-keys)
62
95
96
+
(require 'evil-adjust)
97
+
(evil-adjust)
98
+
63
99
(load-theme 'monokai t)
64
100
65
101
(global-hl-todo-mode)
66
-
(setq hl-todo-color-background t)
67
-
(setq hl-todo-keyword-faces
68
-
'(("TODO" . "#FFEB3B")
69
-
("NOTE" . "#FFEB3B")
70
-
("FIXME" . "#FFEB3B")))
71
102
72
103
;; ----------------------------------------------------------------------
73
104
;; Custom functions
74
105
;; ----------------------------------------------------------------------
75
-
(defun kill-other-buffers ()
76
-
"Kill all other buffers."
106
+
(defun quit-window-and-buffer ()
107
+
"Quit the window, killing its buffer if it was the last window
108
+
displaying that buffer."
109
+
(interactive)
110
+
(setq curbuf (current-buffer))
111
+
(setq curwindow (get-buffer-window curbuf))
112
+
113
+
(if (eq curwindow (next-window nil nil "visible"))
114
+
(kill-buffer)
115
+
(delete-window)
116
+
(unless (get-buffer-window curbuf) (kill-buffer curbuf)))
117
+
)
118
+
119
+
(defun minibuffer-keyboard-quit ()
120
+
"Abort recursive edit.
121
+
In Delete Selection mode, if the mark is active, just deactivate it;
122
+
then it takes a second \\[keyboard-quit] to abort the minibuffer."
77
123
(interactive)
78
-
(mapc 'kill-buffer (delq (current-buffer) (buffer-list))))
124
+
(if (and delete-selection-mode transient-mark-mode mark-active)
125
+
(setq deactivate-mark t)
126
+
(when (get-buffer "*Completions*") (delete-windows-on "*Completions*"))
127
+
(abort-recursive-edit)))
79
128
129
+
;; ----------------------------------------------------------------------
130
+
;; Key bindings
131
+
;; ----------------------------------------------------------------------
132
+
(global-set-key (kbd "s-c") 'evil-yank)
133
+
134
+
;; TODO figure out commenting keybinds
135
+
(global-set-key (kbd "s-/") 'comment-line)
136
+
137
+
(global-set-key (kbd "C-c a") 'org-agenda)
138
+
;; TODO: keybind for org-mode directory?
139
+
;; (global-set-key (kbd "???") '???)
140
+
141
+
(global-set-key (kbd "s-\\") 'evil-window-vsplit)
142
+
(global-set-key (kbd "s-|") 'evil-window-split)
143
+
144
+
(global-set-key (kbd "<s-mouse-1>") (kbd "<mouse-1>"))
145
+
146
+
;; window movement
147
+
(global-set-key (kbd "<M-s-right>") 'windmove-right)
148
+
(global-set-key (kbd "<M-s-left>") 'windmove-left)
149
+
(global-set-key (kbd "<M-s-down>") 'windmove-down)
150
+
(global-set-key (kbd "<M-s-up>") 'windmove-up)
80
151
81
152
;; ----------------------------------------------------------------------
82
153
;; Startup configuration
83
154
;; ----------------------------------------------------------------------
155
+
(setq-default indent-tabs-mode nil)
156
+
157
+
(desktop-save-mode 1)
158
+
(setq-default desktop-save t)
159
+
84
160
(global-display-line-numbers-mode)
85
161
86
-
(setq default-frame-alist
87
-
'((width . 0.5) (height . 1.0)))
162
+
;; Should no longer be needed due to desktop-save-mode
163
+
;; (add-to-list 'default-frame-alist '(width . 0.5))
164
+
;; (add-to-list 'default-frame-alist '(height . 1.0))
88
165
89
-
;; Make `:q` not kill the entier process
90
-
;; TODO: open scratch buffer if this is the "sole remaining window"
91
-
;; Also make `:wq` do the same thing
92
-
(evil-ex-define-cmd "q" 'kill-buffer-and-window)
166
+
;; Make `:q` not kill the entire process
167
+
(evil-ex-define-cmd "q" 'quit-window-and-buffer)
93
168
94
169
;; Typing out `:quit` will still quit emacs
95
170
(evil-ex-define-cmd "quit" 'evil-quit)
96
171
97
-
;; Start with a scratch buffer
98
-
(setq inhibit-startup-screen t)
172
+
;; Make <esc> quit from minibuffer, etc.
173
+
(define-key evil-normal-state-map [escape] 'keyboard-quit)
174
+
(define-key evil-visual-state-map [escape] 'keyboard-quit)
175
+
(define-key minibuffer-local-map [escape] 'minibuffer-keyboard-quit)
176
+
(define-key minibuffer-local-ns-map [escape] 'minibuffer-keyboard-quit)
177
+
(define-key minibuffer-local-completion-map [escape] 'minibuffer-keyboard-quit)
178
+
(define-key minibuffer-local-must-match-map [escape] 'minibuffer-keyboard-quit)
179
+
(define-key minibuffer-local-isearch-map [escape] 'minibuffer-keyboard-quit)
+1
.gitconfig
+1
.gitconfig
+39
-3
.gitignore_global
+39
-3
.gitignore_global
···
1
+
# -*- mode: gitignore; -*-
2
+
3
+
# Common definitions
1
4
*~
5
+
\#*\#
6
+
*.swp
7
+
*.elc
8
+
.\#*
2
9
.DS_Store
3
10
GPATH
4
11
GRTAGS
5
12
GTAGS
13
+
6
14
.python-version
7
-
.vscode/**/*
15
+
16
+
.vscode
8
17
.classpath
9
18
*.egg-info
10
-
/bazel-*
19
+
**/bazel-*
11
20
/private/var/tmp/**/*
12
-
.mypy_cache/**/*
21
+
22
+
# General
23
+
.DS_Store
24
+
.AppleDouble
25
+
.LSOverride
26
+
27
+
# Icon must end with two \r
28
+
Icon
29
+
30
+
31
+
# Thumbnails
32
+
._*
33
+
34
+
# Files that might appear in the root of a volume
35
+
.DocumentRevisions-V100
36
+
.fseventsd
37
+
.Spotlight-V100
38
+
.TemporaryItems
39
+
.Trashes
40
+
.VolumeIcon.icns
41
+
.com.apple.timemachine.donotpresent
42
+
43
+
# Directories potentially created on remote AFP share
44
+
.AppleDB
45
+
.AppleDesktop
46
+
Network Trash Folder
47
+
Temporary Items
48
+
.apdisk
13
49
+127
-186
Library/Application Support/Code/User/keybindings.json
+127
-186
Library/Application Support/Code/User/keybindings.json
···
1
-
// Place your key bindings in this file to overwrite the defaults
2
1
[
3
2
{
4
3
"command": "cursorWordPartStartLeft",
5
4
"key": "alt+left",
6
-
"when": "textInputFocus"
5
+
"when": "textInputFocus && editorLangId != 'org'"
7
6
},
8
7
{
9
8
"command": "cursorWordPartRight",
10
9
"key": "alt+right",
11
-
"when": "textInputFocus"
10
+
"when": "textInputFocus && editorLangId != 'org'"
12
11
},
13
12
{
14
13
"command": "cursorWordPartStartLeftSelect",
···
32
31
},
33
32
{
34
33
"command": "workbench.action.nextEditorInGroup",
35
-
"key": "ctrl+tab",
34
+
"key": "ctrl+tab"
36
35
},
37
36
{
38
37
"command": "-workbench.action.openNextRecentlyUsedEditorInGroup",
39
-
"key": "ctrl+tab",
38
+
"key": "ctrl+tab"
40
39
},
41
40
{
42
41
"command": "-workbench.action.openPreviousRecentlyUsedEditorInGroup",
43
-
"key": "ctrl+shift+tab",
42
+
"key": "ctrl+shift+tab"
44
43
},
45
44
{
46
45
"command": "workbench.action.previousEditorInGroup",
47
-
"key": "ctrl+shift+tab",
46
+
"key": "ctrl+shift+tab"
48
47
},
49
48
{
50
49
"command": "-workbench.action.focusNextGroup",
51
-
"key": "cmd+k cmd+right",
50
+
"key": "cmd+k cmd+right"
51
+
},
52
+
{
53
+
"command": "workbench.action.focusNextGroup",
54
+
"key": "alt+cmd+right"
55
+
},
56
+
{
57
+
"key": "alt+cmd+up",
58
+
"command": "-editor.action.insertCursorAbove",
59
+
"when": "editorTextFocus"
60
+
},
61
+
{
62
+
"key": "alt+cmd+up",
63
+
"command": "workbench.action.focusAboveGroup",
64
+
"when": "editorFocus"
65
+
},
66
+
{
67
+
"key": "alt+cmd+down",
68
+
"command": "-editor.action.insertCursorBelow",
69
+
"when": "editorTextFocus"
70
+
},
71
+
{
72
+
"key": "alt+cmd+down",
73
+
"command": "workbench.action.focusBelowGroup",
74
+
"when": "editorFocus"
52
75
},
53
76
{
54
77
"command": "-workbench.action.focusPreviousGroup",
55
-
"key": "cmd+k cmd+left",
78
+
"key": "cmd+k cmd+left"
79
+
},
80
+
{
81
+
"command": "workbench.action.focusPreviousGroup",
82
+
"key": "alt+cmd+left"
56
83
},
57
84
{
58
85
"command": "-workbench.action.previousEditor",
59
-
"key": "shift+cmd+[",
86
+
"key": "shift+cmd+["
60
87
},
61
88
{
62
89
"command": "-workbench.action.nextEditor",
63
-
"key": "shift+cmd+]",
90
+
"key": "shift+cmd+]"
64
91
},
65
92
{
66
93
"command": "editor.action.triggerSuggest",
···
104
131
},
105
132
{
106
133
"command": "workbench.action.splitEditor",
107
-
"key": "cmd+k cmd+\\",
134
+
"key": "cmd+k cmd+\\"
108
135
},
109
136
{
110
137
"command": "workbench.action.splitEditor",
111
-
"key": "cmd+k \\",
138
+
"key": "cmd+k \\"
112
139
},
113
140
{
114
141
"command": "-workbench.action.splitEditor",
115
-
"key": "cmd+\\",
142
+
"key": "cmd+\\"
116
143
},
117
144
{
118
145
"command": "workbench.action.moveEditorToNextGroup",
119
146
"key": "cmd+\\",
120
-
"when": "!terminalFocus",
147
+
"when": "editorFocus",
148
+
},
149
+
{
150
+
"key": "shift+cmd+\\",
151
+
"command": "-editor.action.jumpToBracket",
152
+
"when": "editorFocus"
153
+
},
154
+
{
155
+
"key": "shift+cmd+\\",
156
+
"command": "workbench.action.splitEditorOrthogonal",
157
+
"when": "editorFocus",
121
158
},
122
159
{
123
160
"command": "-workbench.action.closeOtherEditors",
124
-
"key": "alt+cmd+t",
161
+
"key": "alt+cmd+t"
125
162
},
126
163
{
127
164
"command": "workbench.action.tasks.test",
128
-
"key": "alt+cmd+t",
165
+
"key": "alt+cmd+t"
129
166
},
130
167
{
131
168
"command": "workbench.action.terminal.focusNext",
···
168
205
"when": "terminalFocus"
169
206
},
170
207
{
171
-
"command": "workbench.action.showAllSymbols",
172
-
"key": "shift+cmd+o",
208
+
"command": "-workbench.action.gotoSymbol",
209
+
"key": "cmd+shift+o"
210
+
},
211
+
{
212
+
"command": "workbench.action.openWorkspaceInNewWindow",
213
+
"key": "cmd+shift+o"
214
+
},
215
+
{
216
+
"command": "workbench.action.gotoSymbol",
217
+
"key": "cmd+p"
173
218
},
174
219
{
175
220
"command": "-workbench.action.showAllSymbols",
176
-
"key": "cmd+t",
221
+
"key": "cmd+t"
177
222
},
178
223
{
179
224
"command": "workbench.action.quickOpenNavigateNextInFilePicker",
···
187
232
},
188
233
{
189
234
"command": "workbench.action.quickOpen",
190
-
"key": "cmd+t",
235
+
"key": "cmd+t"
191
236
},
192
237
{
193
238
"command": "-workbench.action.quickOpen",
194
-
"key": "cmd+p",
239
+
"key": "cmd+p"
240
+
},
241
+
{
242
+
"command": "workbench.action.closeMessages",
243
+
"key": "escape",
244
+
"when": "globalMessageVisible"
245
+
},
246
+
// =========================================================================
247
+
// Bindings for vscode-neovim
248
+
// =========================================================================
249
+
{
250
+
"key": "escape",
251
+
"command": "closeFindWidget",
252
+
"when": "neovim.mode != 'insert' && editorFocus && findWidgetVisible"
253
+
},
254
+
{
255
+
"key": "escape",
256
+
"command": "workbench.action.closePanel",
257
+
"when": "neovim.mode != 'insert' && !terminalFocus && activePanel"
258
+
},
259
+
{
260
+
"key": "cmd+/",
261
+
"command": "vscode-neovim.send",
262
+
"when": "editorTextFocus && neovim.init",
263
+
"args": "<C-/>"
195
264
},
196
265
{
266
+
"key": "cmd+c",
267
+
"command": "vscode-neovim.send",
268
+
"when": "editorTextFocus && neovim.init",
269
+
"args": "\"+ygv"
270
+
},
271
+
// =========================================================================
272
+
// End bindings for vscode-neovim
273
+
// =========================================================================
274
+
{
197
275
"command": "editor.action.startFindReplaceAction",
198
276
"key": "cmd+r"
199
277
},
200
278
{
201
279
"command": "workbench.action.tasks.restartTask",
202
-
"key": "alt+cmd+b",
280
+
"key": "alt+cmd+b"
203
281
},
204
282
{
205
283
"command": "workbench.action.editor.changeLanguageMode",
206
-
"key": "cmd+l",
284
+
"key": "cmd+l"
207
285
},
208
286
{
209
287
"command": "-workbench.action.editor.changeLanguageMode",
210
-
"key": "cmd+k m",
211
-
},
212
-
{
213
-
"command": "-python.execSelectionInTerminal",
214
-
"key": "shift+enter",
215
-
"when": "editorFocus && editorLangId == 'python'"
288
+
"key": "cmd+k m"
216
289
},
217
290
{
218
291
"command": "-cursorWordPartRight",
···
245
318
"when": "textInputFocus && !editorReadonly"
246
319
},
247
320
{
248
-
"command": "-workbench.action.toggleFullScreen",
249
-
"key": "ctrl+cmd+f",
250
-
},
251
-
{
252
321
"command": "-editor.action.startFindReplaceAction",
253
-
"key": "alt+cmd+f",
322
+
"key": "alt+cmd+f"
254
323
},
255
324
{
256
-
"command": "workbench.action.toggleFullScreen",
257
-
"key": "ctrl+cmd+f",
325
+
"command": "-workbench.action.nextEditor",
326
+
"key": "alt+cmd+right"
258
327
},
259
328
{
260
-
"command": "-extension.downloadSettings",
261
-
"key": "shift+alt+d",
329
+
"command": "-workbench.action.previousEditor",
330
+
"key": "alt+cmd+left"
262
331
},
263
332
{
264
-
"command": "-extension.updateSettings",
265
-
"key": "shift+alt+u",
333
+
"command": "-workbench.action.focusSideBar",
334
+
"key": "cmd+0"
266
335
},
267
336
{
268
-
"command": "-python.execSelectionInTerminal",
269
-
"key": "shift+enter",
270
-
"when": "editorFocus && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'"
271
-
},
272
-
{
273
-
"command": "-python.datascience.runcurrentcelladvance",
274
-
"key": "shift+enter",
275
-
"when": "editorFocus && python.datascience.featureenabled && python.datascience.hascodecells"
276
-
},
277
-
{
278
-
"command": "-python.execSelectionInTerminal",
279
-
"key": "shift+enter",
280
-
"when": "editorFocus && !findInputFocussed && !python.datascience.hascodecells && !replaceInputFocussed && editorLangId == 'python'"
281
-
},
282
-
{
283
-
"key": "cmd+p",
284
-
"command": "workbench.action.gotoSymbol"
285
-
},
286
-
{
287
-
"key": "shift+cmd+o",
288
-
"command": "-workbench.action.gotoSymbol"
337
+
"command": "workbench.action.zoomReset",
338
+
"key": "cmd+0"
289
339
},
290
340
{
291
341
"key": "shift+cmd+enter",
···
309
359
"when": "panelFocus"
310
360
},
311
361
{
312
-
"key": "cmd+k cmd+z",
313
-
"command": "workbench.action.toggleZenMode",
314
-
"when": "editorTextFocus"
315
-
},
316
-
{
317
-
"key": "shift+enter",
318
362
"command": "-python.execSelectionInTerminal",
319
-
"when": "editorFocus && !findInputFocussed && !python.datascience.ownsSelection && !replaceInputFocussed && editorLangId == 'python'"
320
-
},
321
-
{
322
363
"key": "shift+enter",
323
-
"command": "-python.datascience.execSelectionInteractive",
324
-
"when": "editorFocus && editorHasSelection && python.datascience.featureenabled && python.datascience.ownsSelection && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'"
325
364
},
326
365
{
327
-
"key": "shift+enter",
328
-
"command": "-python.datascience.runcurrentcelladvance",
329
-
"when": "editorFocus && python.datascience.featureenabled && python.datascience.hascodecells && !editorHasSelection"
330
-
},
331
-
{
332
-
"key": "shift+cmd+l",
333
-
"command": "-editor.action.selectHighlights",
334
-
"when": "editorFocus"
335
-
},
336
-
{
337
-
"key": "shift+cmd+l",
338
-
"command": "editor.action.indentUsingSpaces"
339
-
},
340
-
{
341
-
"key": "cmd+0",
342
-
"command": "-workbench.action.focusSideBar"
343
-
},
344
-
{
345
-
"key": "cmd+0",
346
-
"command": "workbench.action.zoomReset"
347
-
},
348
-
{
349
-
"key": "alt+cmd+right",
350
-
"command": "-workbench.action.nextEditor"
351
-
},
352
-
{
353
-
"key": "alt+cmd+left",
354
-
"command": "-workbench.action.previousEditor"
355
-
},
356
-
{
357
-
"key": "shift+cmd+\\",
358
-
"command": "workbench.action.splitEditorOrthogonal"
359
-
},
360
-
{
361
-
"key": "cmd+k cmd+\\",
362
-
"command": "-workbench.action.splitEditorOrthogonal"
363
-
},
364
-
{
365
-
"key": "shift+cmd+\\",
366
-
"command": "-editor.action.jumpToBracket",
367
-
"when": "editorTextFocus"
368
-
},
369
-
{
370
-
"key": "alt+cmd+right",
371
-
"command": "workbench.action.focusRightGroup",
372
-
"when": "!terminalFocus"
373
-
},
374
-
{
375
-
"key": "cmd+k cmd+right",
376
-
"command": "-workbench.action.focusRightGroup"
377
-
},
378
-
{
379
-
"key": "alt+cmd+left",
380
-
"command": "workbench.action.focusLeftGroup",
381
-
"when": "!terminalFocus"
382
-
},
383
-
{
384
-
"key": "cmd+k cmd+left",
385
-
"command": "-workbench.action.focusLeftGroup"
386
-
},
387
-
{
388
-
"key": "alt+cmd+up",
389
-
"command": "workbench.action.focusAboveGroup"
390
-
},
391
-
{
392
-
"key": "cmd+k cmd+up",
393
-
"command": "-workbench.action.focusAboveGroup"
394
-
},
395
-
{
396
-
"key": "alt+cmd+down",
397
-
"command": "workbench.action.focusBelowGroup"
398
-
},
399
-
{
400
-
"key": "cmd+k cmd+down",
401
-
"command": "-workbench.action.focusBelowGroup"
402
-
},
403
-
{
404
-
"key": "alt+cmd+up",
405
-
"command": "-editor.action.insertCursorAbove",
406
-
"when": "editorTextFocus"
407
-
},
408
-
{
409
-
"key": "alt+cmd+down",
410
-
"command": "-editor.action.insertCursorBelow",
411
-
"when": "editorTextFocus"
412
-
},
413
-
{
414
-
"key": "alt+cmd+r",
415
-
"command": "-revealFileInOS",
416
-
"when": "!editorFocus"
417
-
},
418
-
{
419
-
"key": "cmd+k shift+cmd+s",
420
-
"command": "workbench.files.action.showActiveFileInExplorer"
421
-
},
422
-
{
423
-
"key": "ctrl+enter",
424
-
"command": "-python.datascience.runcurrentcell",
425
-
"when": "editorTextFocus && python.datascience.featureenabled && python.datascience.hascodecells && !editorHasSelection"
366
+
"command": "-workbench.action.terminal.split",
367
+
"key": "cmd+\\",
368
+
"when": "terminalFocus"
426
369
},
427
370
{
428
-
"key": "shift+enter",
429
-
"command": "-python.datascience.runcurrentcelladvance",
430
-
"when": "editorTextFocus && python.datascience.featureenabled && python.datascience.hascodecells && !editorHasSelection"
371
+
"command": "workbench.action.terminal.splitInActiveWorkspace",
372
+
"key": "cmd+\\",
373
+
"when": "terminalFocus"
431
374
},
432
375
{
433
-
"key": "shift+enter",
434
-
"command": "-python.datascience.execSelectionInteractive",
435
-
"when": "editorTextFocus && python.datascience.featureenabled && python.datascience.ownsSelection && !findInputFocussed && !replaceInputFocussed && editorLangId == 'python'"
436
-
},
437
-
{
438
-
"key": "shift+enter",
439
-
"command": "-python.execSelectionInTerminal",
440
-
"when": "editorTextFocus && !findInputFocussed && !python.datascience.ownsSelection && !replaceInputFocussed && editorLangId == 'python'"
441
-
},
442
-
{
376
+
"command": "-search.action.openInEditor",
443
377
"key": "cmd+enter",
444
-
"command": "-search.action.openInEditor",
445
378
"when": "hasSearchResult && searchViewletFocus"
446
379
},
447
380
{
448
381
"key": "cmd+enter",
449
382
"command": "search.action.replaceAll",
450
383
"when": "replaceActive && searchViewletFocus && !findWidgetVisible"
384
+
},
385
+
{
386
+
"command": "-workbench.action.openGlobalKeybindings",
387
+
"key": "cmd+k cmd+s"
388
+
},
389
+
{
390
+
"command": "workbench.action.openGlobalKeybindingsFile",
391
+
"key": "cmd+k cmd+s"
451
392
}
452
393
]
+191
-183
Library/Application Support/Code/User/settings.json
+191
-183
Library/Application Support/Code/User/settings.json
···
1
1
{
2
2
"[cpp]": {
3
-
"editor.detectIndentation": false,
4
3
"editor.formatOnSave": true
5
4
},
5
+
"[dockerfile]": {
6
+
"editor.quickSuggestions": {
7
+
"strings": true
8
+
},
9
+
// This seems to highlight EVERYTHING in italics which sucks...
10
+
"editor.semanticHighlighting.enabled": false
11
+
},
12
+
"[graphql]": {
13
+
"editor.tabSize": 2
14
+
},
15
+
"[javascript]": {
16
+
"editor.formatOnSave": true,
17
+
"editor.tabSize": 2
18
+
},
6
19
"[json]": {
7
20
"editor.formatOnSave": false,
8
21
"editor.wordWrap": "on",
···
31
44
"editor.snippetSuggestions": "none",
32
45
"editor.defaultFormatter": "ms-python.python"
33
46
},
34
-
"[dockerfile]": {
35
-
"editor.quickSuggestions": {
36
-
"strings": true
37
-
},
38
-
// This seems to highlight EVERYTHING in italics which sucks...
39
-
"editor.semanticHighlighting.enabled": false
40
-
},
41
47
"[rust]": {
42
48
"editor.formatOnSave": true
43
49
},
···
51
57
},
52
58
"editor.tabSize": 2
53
59
},
54
-
"[javascript]": {
55
-
"editor.formatOnSave": true,
56
-
"editor.tabSize": 2
57
-
},
58
-
"[graphql]": {
59
-
"editor.tabSize": 2
60
+
"[xml]": {
61
+
"editor.defaultFormatter": "redhat.vscode-xml"
60
62
},
63
+
64
+
// TODO: reorganize the remaining sections into extension-specific vs VSCode
65
+
"arduino.defaultBaudRate": 9600,
66
+
"arduino.logLevel": "info",
67
+
61
68
"bazel.buildifierExecutable": "/Users/ichamberlain/go/bin/buildifier",
62
69
"bazel.buildifierFixOnFormat": false,
63
70
"bazel.executable": "/usr/local/bin/bazelisk",
71
+
64
72
"breadcrumbs.enabled": true,
73
+
65
74
"C_Cpp.clang_format_path": "${workspaceFolder}/tools/bin/mac/clang-format",
66
75
"C_Cpp.workspaceParsingPriority": "low",
67
76
"C_Cpp.workspaceSymbols": "Just My Code",
68
77
"C_Cpp.loggingLevel": "Debug",
78
+
69
79
"cmake.cmakePath": "/usr/local/bin/cmake",
70
80
"cmake.configureOnOpen": false,
81
+
71
82
"debug.internalConsoleOptions": "openOnSessionStart",
72
83
"diffEditor.ignoreTrimWhitespace": false,
73
84
"diffEditor.renderSideBySide": true,
85
+
74
86
"editor.accessibilitySupport": "off",
75
-
"editor.fontFamily": "Input Mono",
87
+
"editor.fontFamily": "Input Mono, Monaco, 'Courier New', monospace",
76
88
"editor.fontSize": 11,
77
89
"editor.fontWeight": "100",
78
90
"editor.minimap.showSlider": "always",
91
+
"editor.multiCursorModifier": "alt",
79
92
"editor.renderControlCharacters": false,
80
-
"editor.renderWhitespace": "all",
93
+
"editor.renderWhitespace": "boundary",
81
94
"editor.rulers": [
82
95
80
83
96
],
···
85
98
"editor.showFoldingControls": "always",
86
99
"editor.snippetSuggestions": "top",
87
100
"editor.wordSeparators": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-_",
101
+
88
102
"explorer.autoReveal": false,
89
103
"explorer.confirmDelete": false,
104
+
90
105
"extensions.autoUpdate": false,
91
106
"extensions.ignoreRecommendations": false,
92
-
"rfLanguageServer.logLevel": "info",
93
-
"shellcheck.run": "onSave",
94
-
"shellcheck.enableQuickFix": true,
95
-
"shellcheck.ignorePatterns": {
96
-
"**/*.zsh": true,
97
-
"**/*.fish": true,
98
-
"**/BUILD": true,
99
-
},
107
+
100
108
"files.associations": {
109
+
// TODO: some of these should be workspace-specific...
101
110
"**/.bazelignore": "gitignore",
102
-
"*.bazel": "starlark",
103
-
"*.bazelrc": "gitignore",
111
+
"**/.cargo/config": "toml",
112
+
"**/.ssh/config": "ssh_config",
104
113
"**/BUILD": "starlark",
105
-
".gitmodules": "properties",
106
114
"*.aliases": "shellscript",
115
+
"*.bazel": "starlark",
116
+
"*.bazelrc": "gitignore",
107
117
"*.h": "c",
108
118
"*.init": "json",
119
+
"*.inputactions": "json",
109
120
"*.j2": "jinja",
110
-
"*.lock": "toml",
111
-
"yarn.lock": "yarnlock",
112
121
"*.my": "mib",
122
+
"*.org": "org",
123
+
"*.plist": "xml",
113
124
"*.repo": "ini",
125
+
"*.rs": "rust",
114
126
"*.service": "ini",
115
127
"*.sls": "sls",
128
+
"*.unity": "yaml",
129
+
"*Brewfile": "ruby",
130
+
"*dockerfile": "dockerfile",
131
+
".clang-format": "yaml",
132
+
".coveragerc": "ini",
133
+
".gitmodules": "properties",
134
+
"Cargo.lock": "toml",
116
135
"bash_profile": "shellscript",
117
136
"bashrc": "shellscript",
118
-
"config": "toml",
119
-
"vimrc": "viml",
120
137
"build": "shellscript",
121
-
".coveragerc": "ini",
122
-
"*.plist": "xml",
123
138
"gdbinit": "shellscript",
124
139
"minion": "log",
125
-
"*dockerfile": "dockerfile",
126
-
"**/.ssh/config": "ssh_config",
127
-
"*.org": "org"
140
+
"vimrc": "viml",
141
+
"yarn.lock": "yarnlock"
128
142
},
129
143
"files.exclude": {
130
-
"__pycache__": true,
131
144
"**/.DS_Store": true,
132
145
"**/.git": true,
133
146
"**/.hg": true,
134
147
"**/.svn": true,
148
+
"**/CVS": true,
135
149
"**/bazel-*": true,
136
-
"**/CVS": true
150
+
"__pycache__": true
137
151
},
138
152
"files.insertFinalNewline": true,
139
153
"files.trimTrailingWhitespace": true,
154
+
140
155
"git.autoRepositoryDetection": "openEditors",
141
156
"git.detectSubmodules": false,
142
157
"git.enableSmartCommit": true,
143
158
"git.openDiffOnClick": false,
159
+
144
160
"gitlens.advanced.fileHistoryFollowsRenames": false,
145
-
// GitLens settings
146
161
"gitlens.advanced.messages": {
147
162
"suppressCommitHasNoPreviousCommitWarning": false,
148
163
"suppressCommitNotFoundWarning": false,
···
207
222
"gitlens.views.repositories.autoRefresh": false,
208
223
"gitlens.views.repositories.enabled": false,
209
224
"gitlens.views.search.files.layout": "list",
225
+
226
+
"go.formatTool": "goimports",
227
+
210
228
"grunt.autoDetect": "off",
229
+
211
230
"gulp.autoDetect": "off",
231
+
212
232
"jake.autoDetect": "off",
213
-
"python.venvPath": "/Users/ichamberlain/.pyenv",
214
-
"python.terminal.activateEnvironment": false,
233
+
234
+
"org.todoKeywords": [
235
+
"TODO",
236
+
"PROG",
237
+
"DONE"
238
+
],
239
+
240
+
"python.dataScience.enabled": false,
241
+
"python.formatting.provider": "black",
215
242
"python.linting.lintOnSave": true,
216
-
"remote.containers.defaultExtensions": [
217
-
"codezombiech.gitignore",
218
-
"vscodevim.vim"
219
-
],
243
+
"python.terminal.activateEnvironment": false,
244
+
"python.venvPath": "~/.pyenv",
245
+
246
+
"remote.SSH.configFile": "~/.ssh/vscode_config",
247
+
248
+
"rfLanguageServer.logLevel": "info",
249
+
220
250
"rpmspec.lint": false,
251
+
221
252
"rust-analyzer.checkOnSave.enable": true,
222
-
"sync.autoDownload": false,
223
-
"sync.autoUpload": false,
224
-
"sync.forceDownload": false,
225
-
"sync.gist": "f7654cb18c397fb8c4f4b433d6ecc48a",
226
-
"sync.quietSync": false,
227
-
"sync.removeExtensions": true,
228
-
"sync.syncExtensions": true,
253
+
"rust-analyzer.inlayHints.maxLength": 10,
254
+
"rust-analyzer.inlayHints.typeHints": false,
255
+
256
+
"shellcheck.run": "onSave",
257
+
"shellcheck.enableQuickFix": true,
258
+
"shellcheck.ignorePatterns": {
259
+
"**/*.zsh": true,
260
+
"**/*.fish": true,
261
+
"**/BUILD": true,
262
+
},
263
+
229
264
"telemetry.enableTelemetry": false,
265
+
266
+
"terminal.integrated.copyOnSelection": true,
230
267
"terminal.integrated.fontSize": 11,
231
-
"terminal.integrated.copyOnSelection": true,
268
+
"terminal.integrated.rightClickBehavior": "default",
232
269
"terminal.integrated.scrollback": 10000,
233
270
"terminal.integrated.enableBell": true,
234
271
"terminal.integrated.macOptionClickForcesSelection": true,
235
-
"todohighlight.keywords": [
236
-
"TODO",
237
-
"FIXME",
238
-
"NOTE"
239
-
],
240
-
// vim settings
241
-
"vim.foldfix": true,
242
-
"vim.hlsearch": true,
243
-
"vim.iskeyword": "/\\()\"':,.;<>~!@#$%^&*|+=[]{}`?-_",
244
-
"vim.normalModeKeyBindings": [
245
-
{
246
-
"after": [
247
-
"<esc>"
248
-
],
249
-
"before": [
250
-
"<esc>"
251
-
],
252
-
"commands": [
253
-
{
254
-
"command": ":nohl"
255
-
},
256
-
{
257
-
"command": "closeFindWidget",
258
-
"key": "escape",
259
-
"when": "findWidgetVisible"
260
-
},
261
-
{
262
-
"command": "workbench.action.closePanel",
263
-
"key": "escape"
264
-
},
265
-
{
266
-
"command": "notifications.hideToasts",
267
-
"when": "notificationToastsVisible"
268
-
},
269
-
{
270
-
"command": "notifications.hideList",
271
-
"when": "notificationCenterVisible"
272
-
}
273
-
]
274
-
},
275
-
{
276
-
"after": [],
277
-
"before": [
278
-
"?"
279
-
],
280
-
"commands": [
281
-
{
282
-
"command": "actions.find",
283
-
"when": "editorFocus"
284
-
},
285
-
{
286
-
"command": "editor.action.previousMatchFindAction",
287
-
"when": "editorFocus"
288
-
}
289
-
]
290
-
},
291
-
{
292
-
"after": [],
293
-
"before": [
294
-
"/"
295
-
],
296
-
"commands": [
297
-
{
298
-
"command": "actions.find",
299
-
"when": "editorFocus"
300
-
},
301
-
{
302
-
"command": "editor.action.nextMatchFindAction",
303
-
"when": "editorFocus"
304
-
}
305
-
]
306
-
},
307
-
{
308
-
"after": [],
309
-
"before": [
310
-
"n"
311
-
],
312
-
"commands": [
313
-
{
314
-
"command": "editor.action.nextMatchFindAction",
315
-
"when": "editorFocus"
316
-
}
317
-
]
272
+
273
+
"typescript.check.npmIsInstalled": false,
274
+
275
+
"vscode-neovim.highlightGroups.highlights": {
276
+
"Conceal": "vim",
277
+
"Directory": "vim",
278
+
"IncSearch": {
279
+
"backgroundColor": "theme.editor.findMatchBackground",
280
+
"borderColor": "theme.editor.findMatchBorder"
318
281
},
319
-
{
320
-
"after": [],
321
-
"before": [
322
-
"N"
323
-
],
324
-
"commands": [
325
-
{
326
-
"command": "editor.action.previousMatchFindAction",
327
-
"when": "editorFocus"
328
-
}
329
-
]
282
+
"Search": {
283
+
"backgroundColor": "theme.editor.findMatchHighlightBackground",
284
+
"borderColor": "theme.editor.findMatchHighlightBorder"
330
285
},
331
-
{
332
-
"after": [],
333
-
"before": [
334
-
"u"
335
-
],
336
-
"commands": [
337
-
{
338
-
"args": [],
339
-
"command": "undo"
340
-
}
341
-
]
286
+
"Substitute": "vim",
287
+
"Todo": {
288
+
"backgroundColor": "#ffeb3b",
289
+
"color": "#2196f3",
290
+
"overviewRulerColor": "rgba(255,189,42,0.8)"
342
291
},
343
-
{
344
-
"after": [],
345
-
"before": [
346
-
"<C-r>"
347
-
],
348
-
"commands": [
349
-
{
350
-
"args": [],
351
-
"command": "redo"
352
-
}
353
-
]
292
+
"Visual": {
293
+
"backgroundColor": "theme.editor.selectionBackground"
354
294
}
295
+
},
296
+
"vscode-neovim.highlightGroups.ignoreHighlights": [
297
+
"SpecialKey",
298
+
"EndOfBuffer",
299
+
"TermCursor",
300
+
"TermCursorNC",
301
+
"NonText",
302
+
"ErrorMsg",
303
+
"MoreMsg",
304
+
"ModeMsg",
305
+
"LineNr",
306
+
"CursorLineNr",
307
+
"Question",
308
+
"StatusLine",
309
+
"StatusLineNC",
310
+
"VertSplit",
311
+
"Title",
312
+
"VisualNC",
313
+
"WarningMsg",
314
+
"WildMenu",
315
+
"^Diff",
316
+
"Sign",
317
+
"SignColumn",
318
+
"^Spell",
319
+
"^Pmenu",
320
+
"^Tab",
321
+
"^Cursor",
322
+
"ColorColumn",
323
+
"QuickFixLine",
324
+
"Whitespace",
325
+
"NormalNC",
326
+
"Normal",
327
+
"NormalFloat",
328
+
"MsgSeparator",
329
+
"MsgArea",
330
+
"^RedrawDebug",
331
+
"Cursor",
332
+
"lCursor",
333
+
"MatchParen",
334
+
"^Nvim",
335
+
"Operator",
336
+
"Delimiter",
337
+
"Identifier",
338
+
"SpecialChar",
339
+
"Number",
340
+
"Type",
341
+
"String",
342
+
"Error",
343
+
"Comment",
344
+
"Constant",
345
+
"Special",
346
+
"Statement",
347
+
"PreProc",
348
+
"Underlined",
349
+
"Ignore",
350
+
"Character",
351
+
"Boolean",
352
+
"Float",
353
+
"Function",
354
+
"Conditional",
355
+
"Repeat",
356
+
"Label",
357
+
"Keyword",
358
+
"Exception",
359
+
"Include",
360
+
"Define",
361
+
"Macro",
362
+
"PreCondit",
363
+
"StorageClass",
364
+
"Structure",
365
+
"Typedef",
366
+
"Tag",
367
+
"SpecialComment",
368
+
"Debug",
369
+
"Folded",
370
+
"FoldColumn"
355
371
],
356
-
"vim.searchHighlightColor": "rgba(157, 85, 15, 1.0)",
357
-
"vim.useSystemClipboard": false,
358
-
"vim.visualstar": true,
372
+
"vscode-neovim.neovimExecutablePaths.darwin": "/usr/local/bin/nvim",
373
+
"vscode-neovim.neovimInitPath": "~/.vimrc",
374
+
"vscode-neovim.neovimPath": "/usr/local/bin/nvim",
375
+
359
376
"window.restoreWindows": "folders",
360
377
"window.title": "${folderName}${separator}${activeEditorMedium} ${dirty}",
361
378
"window.zoomLevel": 0,
362
-
"workbench.editor.untitled.labelFormat": "name",
379
+
363
380
"workbench.colorCustomizations": {
364
381
"editor.selectionBackground": "#9d550f",
365
382
"editorCursor.foreground": "#9d550f"
366
383
},
367
384
"workbench.colorTheme": "Monokai",
368
385
"workbench.editor.enablePreview": false,
386
+
"workbench.editor.untitled.labelFormat": "name",
369
387
"workbench.fontAliasing": "auto",
370
388
"workbench.settings.editor": "json",
371
389
"workbench.startupEditor": "newUntitledFile",
372
-
"editor.multiCursorModifier": "alt",
373
-
"go.formatTool": "goimports",
374
-
"[xml]": {
375
-
"editor.defaultFormatter": "redhat.vscode-xml"
376
-
},
377
-
"yaml.schemas": {
378
-
"file:///Users/ichamberlain/.vscode/extensions/atlassian.atlascode-1.2.2/resources/schemas/pipelines-schema.json": "bitbucket-pipelines.yml"
379
-
},
380
-
"remote.SSH.configFile": "~/.ssh/vscode_config",
381
-
"editor.minimap.enabled": false
382
390
}
+16
-2
Library/Application Support/Code/User/snippets/rust.json
+16
-2
Library/Application Support/Code/User/snippets/rust.json
···
1
1
{
2
-
// Place your snippets for rust here. Each snippet is defined under a snippet name and has a prefix, body and
2
+
// Place your snippets for rust here. Each snippet is defined under a snippet name and has a prefix, body and
3
3
// description. The prefix is what is used to trigger the snippet and the body will be expanded and inserted. Possible variables are:
4
-
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the
4
+
// $1, $2 for tab stops, $0 for the final cursor position, and ${1:label}, ${2:another} for placeholders. Placeholders with the
5
5
// same ids are connected.
6
6
// Example:
7
7
// "Print to console": {
···
12
12
// ],
13
13
// "description": "Log output to console"
14
14
// }
15
+
"dbg!": {
16
+
"prefix": "dbg",
17
+
"body": [
18
+
"dbg!($1)",
19
+
],
20
+
"description": "Fix typo of dgb -> dbg!"
21
+
},
22
+
"dbg! typo": {
23
+
"prefix": "dgb",
24
+
"body": [
25
+
"dbg!($1)",
26
+
],
27
+
"description": "Fix typo of dgb -> dbg!"
28
+
}
15
29
}