Skip to content

Commit ceb51c3

Browse files
authored
feat(all): update (#121)
* fix: homebrew/bundle was deprecated * chore(mise): install terraform * chore: add cursor * feat: add finicky * chore(vscode): update extensions * fix(dofy): work brew bundle command * chore(brew): dump * chore(zsh): update path * style: lint * test(dofy): fix test
1 parent 2fcfeb0 commit ceb51c3

File tree

27 files changed

+489
-72
lines changed

27 files changed

+489
-72
lines changed

config/finicky/.finicky.js

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
module.exports = {
2+
defaultBrowser: "Arc",
3+
handlers: [
4+
{
5+
match: ["discord.com*"],
6+
url: {
7+
protocol: "discord",
8+
},
9+
browser: "Discord",
10+
},
11+
{
12+
match: finicky.matchHostnames([
13+
"drive.google.com",
14+
"docs.google.com",
15+
"forms.gle"
16+
]),
17+
browser: {
18+
name: "Google Chrome",
19+
profile: "Profile 1",
20+
},
21+
},
22+
],
23+
};

config/git/.config/config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[core]
22
autocrlf = input
33
excludesFile = /Users/shiron/.config/git/ignore
4-
editor = code --wait
4+
editor = cursor --wait
55
ignorecase = true
66
[gpg]
77
program = /opt/homebrew/bin/gpg

config/mise/.config/config.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
[tools]
22
java = "17"
3-
python = "3.13"
3+
python = "3.13.3"
4+
terraform = "latest"

config/vscode/Application Support/keybindings.json

Lines changed: 205 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,5 +128,210 @@
128128
"key": "cmd+backspace",
129129
"command": "-deleteAllLeft",
130130
"when": "textInputFocus && !editorReadonly"
131+
},
132+
{
133+
"key": "cmd+i",
134+
"command": "-cloudcode.duetAI.showinEditor",
135+
"when": "authLoggedIn && config.geminicodeassist.enable && editorTextFocus && shouldRegisterInEditorCommand && !inGeminiDiffView && !isInDiffEditor"
136+
},
137+
{
138+
"key": "shift+cmd+i",
139+
"command": "workbench.action.chat.startVoiceChat",
140+
"when": "chatIsEnabled && hasSpeechProvider && inChatInput && !chatSessionRequestInProgress && !editorFocus && !notebookEditorFocused && !scopedVoiceChatGettingReady && !speechToTextInProgress || chatIsEnabled && hasSpeechProvider && inlineChatFocused && !chatSessionRequestInProgress && !editorFocus && !notebookEditorFocused && !scopedVoiceChatGettingReady && !speechToTextInProgress"
141+
},
142+
{
143+
"key": "cmd+i",
144+
"command": "-workbench.action.chat.startVoiceChat",
145+
"when": "chatIsEnabled && hasSpeechProvider && inChatInput && !chatSessionRequestInProgress && !editorFocus && !notebookEditorFocused && !scopedVoiceChatGettingReady && !speechToTextInProgress || chatIsEnabled && hasSpeechProvider && inlineChatFocused && !chatSessionRequestInProgress && !editorFocus && !notebookEditorFocused && !scopedVoiceChatGettingReady && !speechToTextInProgress"
146+
},
147+
{
148+
"key": "shift+cmd+i",
149+
"command": "workbench.action.chat.stopListeningAndSubmit",
150+
"when": "inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'editor' || inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'inline' || inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'quick' || inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'view' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'editor' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'inline' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'quick' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'view'"
151+
},
152+
{
153+
"key": "cmd+i",
154+
"command": "-workbench.action.chat.stopListeningAndSubmit",
155+
"when": "inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'editor' || inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'inline' || inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'quick' || inChatInput && voiceChatInProgress && scopedVoiceChatInProgress == 'view' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'editor' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'inline' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'quick' || inlineChatFocused && voiceChatInProgress && scopedVoiceChatInProgress == 'view'"
156+
},
157+
{
158+
"key": "cmd+k cmd+s",
159+
"command": "-workbench.action.openGlobalKeybindings"
160+
},
161+
{
162+
"key": "cmd+k cmd+s",
163+
"command": "git.stageSelectedRanges",
164+
"when": "editorTextFocus && !operationInProgress && resourceScheme == 'file'"
165+
},
166+
{
167+
"key": "cmd+k alt+cmd+s",
168+
"command": "-git.stageSelectedRanges",
169+
"when": "editorTextFocus && !operationInProgress && resourceScheme == 'file'"
170+
},
171+
{
172+
"key": "cmd+l",
173+
"command": "aipopup.action.modal.generate",
174+
"when": "editorFocus && !composerBarIsVisible"
175+
},
176+
{
177+
"key": "cmd+k",
178+
"command": "-aipopup.action.modal.generate",
179+
"when": "editorFocus && !composerBarIsVisible"
180+
},
181+
{
182+
"key": "cmd+i",
183+
"command": "composer.startComposerPrompt"
184+
},
185+
{
186+
"key": "cmd+i",
187+
"command": "-composer.startComposerPrompt"
188+
},
189+
{
190+
"key": "cmd+i",
191+
"command": "composer.closeComposerTab",
192+
"when": "composerFocused && !editorTextFocus || !editorTextFocus && focusedView =~ /^workbench.panel.aichat.view/"
193+
},
194+
{
195+
"key": "cmd+w",
196+
"command": "-composer.closeComposerTab",
197+
"when": "composerFocused && !editorTextFocus || !editorTextFocus && focusedView =~ /^workbench.panel.aichat.view/"
198+
},
199+
{
200+
"key": "cmd+[",
201+
"command": "workbench.action.navigateBack",
202+
"when": "canNavigateBack"
203+
},
204+
{
205+
"key": "ctrl+[Minus]",
206+
"command": "-workbench.action.navigateBack",
207+
"when": "canNavigateBack"
208+
},
209+
{
210+
"key": "cmd+]",
211+
"command": "workbench.action.navigateForward",
212+
"when": "canNavigateForward"
213+
},
214+
{
215+
"key": "ctrl+[IntlRo]",
216+
"command": "-workbench.action.navigateForward",
217+
"when": "canNavigateForward"
218+
},
219+
{
220+
"key": "cmd+e",
221+
"command": "testing.runAtCursor",
222+
"when": "editorTextFocus"
223+
},
224+
{
225+
"key": "cmd+[Semicolon] c",
226+
"command": "-testing.runAtCursor",
227+
"when": "editorTextFocus"
228+
},
229+
{
230+
"key": "cmd+t",
231+
"command": "-workbench.action.showAllSymbols"
232+
},
233+
{
234+
"key": "ctrl+p",
235+
"command": "-cursorUp",
236+
"when": "textInputFocus"
237+
},
238+
{
239+
"key": "ctrl+p",
240+
"command": "-showPrevParameterHint",
241+
"when": "editorFocus && parameterHintsMultipleSignatures && parameterHintsVisible"
242+
},
243+
{
244+
"key": "ctrl+p",
245+
"command": "-selectPrevSuggestion",
246+
"when": "suggestWidgetMultipleSuggestions && suggestWidgetVisible && textInputFocus || suggestWidgetVisible && textInputFocus && !suggestWidgetHasFocusedSuggestion"
247+
},
248+
{
249+
"key": "shift+cmd+e",
250+
"command": "testing.debugAtCursor",
251+
"when": "editorTextFocus"
252+
},
253+
{
254+
"key": "cmd+[Semicolon] cmd+c",
255+
"command": "-testing.debugAtCursor",
256+
"when": "editorTextFocus"
257+
},
258+
{
259+
"key": "ctrl+t",
260+
"command": "-editor.action.transposeLetters",
261+
"when": "textInputFocus && !editorReadonly"
262+
},
263+
{
264+
"key": "shift+cmd+e",
265+
"command": "-workbench.view.explorer",
266+
"when": "viewContainer.workbench.view.explorer.enabled"
267+
},
268+
{
269+
"key": "cmd+e",
270+
"command": "-editor.action.toggleScreenReaderAccessibilityMode",
271+
"when": "accessibilityHelpIsShown"
272+
},
273+
{
274+
"key": "cmd+e",
275+
"command": "-actions.findWithSelection"
276+
},
277+
{
278+
"key": "ctrl+e",
279+
"command": "testing.runCurrentFile",
280+
"when": "editorTextFocus"
281+
},
282+
{
283+
"key": "cmd+[Semicolon] f",
284+
"command": "-testing.runCurrentFile",
285+
"when": "editorTextFocus"
286+
},
287+
{
288+
"key": "shift+cmd+i",
289+
"command": "composer.newAgentChat"
290+
},
291+
{
292+
"key": "shift+cmd+i",
293+
"command": "-composer.newAgentChat"
294+
},
295+
{
296+
"key": "shift+cmd+d",
297+
"command": "-composer.fixerrormessage",
298+
"when": "@composer.isCursorOnLint"
299+
},
300+
{
301+
"key": "shift+cmd+d",
302+
"command": "editor.action.selectHighlights",
303+
"when": "editorFocus"
304+
},
305+
{
306+
"key": "shift+cmd+l",
307+
"command": "-editor.action.selectHighlights",
308+
"when": "editorFocus"
309+
},
310+
{
311+
"key": "cmd+l",
312+
"command": "-aichat.newchataction"
313+
},
314+
{
315+
"key": "shift+cmd+l",
316+
"command": "-notebook.selectAllFindMatches",
317+
"when": "config.notebook.multiCursor.enabled && notebookFindWidgetFocused || config.notebook.multiCursor.enabled && notebookCellEditorFocused && activeEditor == 'workbench.editor.notebook'"
318+
},
319+
{
320+
"key": "shift+cmd+l",
321+
"command": "-selectAllSearchEditorMatches",
322+
"when": "inSearchEditor"
323+
},
324+
{
325+
"key": "shift+cmd+l",
326+
"command": "-addCursorsAtSearchResults",
327+
"when": "fileMatchOrMatchFocus && searchViewletVisible"
328+
},
329+
{
330+
"key": "shift+cmd+l",
331+
"command": "-aichat.insertselectionintochat"
332+
},
333+
{
334+
"key": "shift+cmd+l",
335+
"command": "aichat.insertselectionintochat"
131336
}
132337
]

config/vscode/Application Support/settings.json

Lines changed: 64 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,19 +159,69 @@
159159
"background.enabled": false,
160160
"go.toolsManagement.autoUpdate": true,
161161
"emeraldwalk.runonsave": {
162-
"commands": [
163-
{
164-
"match": ".*\\.(yml|yaml)$",
165-
"cmd": "yamlfmt ${file}",
166-
"autoShowOutputPanel": "error"
167-
},
168-
{
169-
"match": ".*\\.proto$",
170-
"cmd": "buf format -w ${file}",
171-
"autoShowOutputPanel": "error"
172-
}
173-
]
162+
"commands": [
163+
{
164+
"match": ".*\\.(yml|yaml)$",
165+
"cmd": "yamlfmt ${file}",
166+
"autoShowOutputPanel": "error"
167+
},
168+
{
169+
"match": ".*\\.proto$",
170+
"cmd": "buf format -w ${file}",
171+
"autoShowOutputPanel": "error"
172+
}
173+
]
174+
},
175+
"github.copilot.nextEditSuggestions.enabled": true,
176+
"geminicodeassist.project": "",
177+
"geminicodeassist.inlineSuggestions.enableAuto": false,
178+
"diffEditor.codeLens": true,
179+
"github.copilot.chat.commitMessageGeneration.instructions": [
180+
{
181+
"text": "Use conventional commit message format. Scope must be included. Body should be included if the commit is somewhat large."
182+
},
183+
{
184+
"text": "In many cases, such as when touching .github and below, the ci type is applicable."
185+
},
186+
{
187+
"text": "Please use English."
188+
},
189+
{
190+
"text": "One of type: `build: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)`"
191+
},
192+
{
193+
"text": "One of type: `ci: Changes to our CI configuration files and scripts (example scopes: github, renovate)`"
194+
},
195+
{
196+
"text": "One of type: `docs: Documentation only changes`"
197+
},
198+
{
199+
"text": "One of type: `feat: A new feature`"
174200
},
175-
"github.copilot.nextEditSuggestions.enabled": true,
176-
"cloudcode.duetAI.project": ""
201+
{
202+
"text": "One of type: `fix: A bug fix`"
203+
},
204+
{
205+
"text": "One of type: `perf: A code change that improves performance`"
206+
},
207+
{
208+
"text": "One of type: `refactor: A code change that neither fixes a bug nor adds a feature`"
209+
},
210+
{
211+
"text": "One of type: `style: Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)`"
212+
},
213+
{
214+
"text": "One of type: `test: Adding missing tests or correcting existing tests`"
215+
}
216+
],
217+
"[jsonc]": {
218+
"editor.defaultFormatter": "vscode.json-language-features"
219+
},
220+
"accessibility.voice.speechLanguage": "ja-JP",
221+
"liveshare.accessibility.voice": "ja-JP-Nanami",
222+
"protoc": {
223+
"options": [
224+
"-I=~/.cache/buf/v1/module/data/buf.build"
225+
]
226+
}
177227
}

config/vscode/extensions

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,10 @@ dart-code.flutter
1414
davidanson.vscode-markdownlint
1515
dbaeumer.vscode-eslint
1616
devsense.composer-php-vscode
17+
devsense.intelli-php-vscode
1718
devsense.phptools-vscode
19+
devsense.profiler-php-vscode
20+
docker.docker
1821
donjayamanne.githistory
1922
eamodio.gitlens
2023
ecmel.vscode-html-css
@@ -41,18 +44,24 @@ jinliming2.vscode-go-template
4144
mariusalchimavicius.json-to-ts
4245
mechatroner.rainbow-csv
4346
mhutchie.git-graph
44-
ms-azuretools.vscode-docker
47+
ms-azuretools.vscode-containers
4548
ms-ceintl.vscode-language-pack-ja
4649
ms-playwright.playwright
4750
ms-python.black-formatter
4851
ms-python.debugpy
52+
ms-python.flake8
53+
ms-python.isort
54+
ms-python.mypy-type-checker
4955
ms-python.python
5056
ms-python.vscode-pylance
5157
ms-toolsai.jupyter
5258
ms-toolsai.jupyter-keymap
5359
ms-toolsai.jupyter-renderers
60+
ms-toolsai.vscode-jupyter-cell-tags
61+
ms-toolsai.vscode-jupyter-slideshow
5462
ms-vscode-remote.remote-containers
5563
ms-vscode-remote.remote-ssh
64+
ms-vscode-remote.remote-ssh-edit
5665
ms-vscode-remote.vscode-remote-extensionpack
5766
ms-vscode.cmake-tools
5867
ms-vscode.cpptools
@@ -65,6 +74,7 @@ ms-vscode.remote-repositories
6574
ms-vscode.remote-server
6675
ms-vscode.vscode-serial-monitor
6776
ms-vscode.vscode-speech
77+
ms-vscode.vscode-speech-language-pack-ja-jp
6878
ms-vscode.vscode-typescript-next
6979
ms-vsliveshare.vsliveshare
7080
naumovs.color-highlight

0 commit comments

Comments
 (0)