From 9bdf1db20f09c4dd912e68b9249c9af5ca02009d Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Wed, 14 May 2025 23:57:59 +0900 Subject: [PATCH 1/8] =?UTF-8?q?fix:=20zsh=E3=82=92=E4=BD=BF=E3=81=86?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 756eab3..42a2628 100644 --- a/install.sh +++ b/install.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env zsh set -euo pipefail INSTALL_DIR="$HOME/dotfiles" From 6c777f6e5a5150f608aff5a3f2575d6404473891 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Wed, 14 May 2025 23:59:25 +0900 Subject: [PATCH 2/8] =?UTF-8?q?fix:=20=E3=82=B7=E3=83=B3=E3=83=9C=E3=83=AA?= =?UTF-8?q?=E3=83=83=E3=82=AF=E3=83=AA=E3=83=B3=E3=82=AF=E4=BD=9C=E6=88=90?= =?UTF-8?q?=E3=81=99=E3=82=8B=E3=82=BF=E3=82=A4=E3=83=9F=E3=83=B3=E3=82=B0?= =?UTF-8?q?=E3=82=92=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/setup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/setup.sh b/scripts/setup.sh index d9b1bae..9c1f602 100644 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -5,11 +5,11 @@ echo "「dotfiles」のセットアップを開始しました" INSTALL_DIR="$HOME/dotfiles" +sh "$INSTALL_DIR/scripts/link_dotfiles.sh" sh "$INSTALL_DIR/scripts/homebrew_setup.sh" sh "$INSTALL_DIR/scripts/asdf_setup.sh" sh "$INSTALL_DIR/scripts/vscode_setup.sh" sh "$INSTALL_DIR/scripts/xcode_setup.sh" sh "$INSTALL_DIR/scripts/android_setup.sh" -sh "$INSTALL_DIR/scripts/link_dotfiles.sh" echo "「dotfiles」のセットアップが完了しました" From edd07335037c3ed171beeed9554191c469eaa95c Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 May 2025 00:00:18 +0900 Subject: [PATCH 3/8] =?UTF-8?q?add:=20asdf=E3=81=AB=E9=96=A2=E3=81=99?= =?UTF-8?q?=E3=82=8B=E3=82=B7=E3=83=B3=E3=83=9C=E3=83=AA=E3=83=83=E3=82=AF?= =?UTF-8?q?=E3=83=AA=E3=83=B3=E3=82=AF=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/link_dotfiles.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/link_dotfiles.sh b/scripts/link_dotfiles.sh index c1f2567..7a9600b 100644 --- a/scripts/link_dotfiles.sh +++ b/scripts/link_dotfiles.sh @@ -12,6 +12,7 @@ LINKS=( "$DOTFILES_DIR/git/.gitconfig:$HOME/.gitconfig" "$DOTFILES_DIR/git/.gitignore:$HOME/.gitignore" "$DOTFILES_DIR/git/.gitattributes:$HOME/.gitattributes" + "$DOTFILES_DIR/asdf/.tool-versions:$HOME/.tool-versions" "$DOTFILES_DIR/aws/config:$HOME/.aws/config" "$DOTFILES_DIR/vscode/settings.json:$HOME/Library/Application Support/Code/User/settings.json" "$DOTFILES_DIR/android/sdk:$HOME/Library/Android/sdk" From a53991d8a02195196733cfc51ba63a158ea83686 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 May 2025 00:00:52 +0900 Subject: [PATCH 4/8] =?UTF-8?q?fix:=20sdk=E3=81=AE=E3=83=91=E3=82=B9?= =?UTF-8?q?=E3=81=8C=E8=AA=AD=E3=81=BF=E8=BE=BC=E3=82=81=E3=81=AA=E3=81=8B?= =?UTF-8?q?=E3=81=A3=E3=81=9F=E3=81=AE=E3=81=A7=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/android_setup.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/android_setup.sh b/scripts/android_setup.sh index b72e91e..ba943a3 100755 --- a/scripts/android_setup.sh +++ b/scripts/android_setup.sh @@ -3,6 +3,7 @@ set -euo pipefail echo "「Android」のセットアップを開始しました" +SDK_DIR="/opt/homebrew/share/android-commandlinetools" CMDLINE_TOOLS_DIR="/opt/homebrew/share/android-commandlinetools/cmdline-tools/latest" if [ -d "$CMDLINE_TOOLS_DIR" ]; then @@ -19,4 +20,7 @@ fi # Androidのライセンスに同意 yes | flutter doctor --android-licenses || true +# FlutterにSDKパスを教える +flutter config --android-sdk "$SDK_DIR" + echo "「Android」のセットアップが完了しました" From 0cb303c9042a7e2087b9b19a764c8e510f58a27e Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 May 2025 00:01:56 +0900 Subject: [PATCH 5/8] =?UTF-8?q?add:=20Ruby=E5=91=A8=E3=82=8A=E3=81=A7?= =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=81=8C=E5=87=BA=E3=81=AA=E3=81=84=E3=82=88?= =?UTF-8?q?=E3=81=86=E3=81=AB=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/settings.json | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vscode/settings.json b/vscode/settings.json index 1801768..07d3270 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -14,7 +14,11 @@ "editor.rulers": [ 120 ], - "editor.semanticHighlighting.enabled": true + "editor.semanticHighlighting.enabled": true, + "ruby.lint": { + "rubocop": false + }, + "ruby.rubocop.useBundler": false }, "explorer.compactFolders": false, "javascript.updateImportsOnFileMove.enabled": "never", From 8fe5917d1a56eeaa617a067921b1ec826533b929 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 May 2025 00:02:48 +0900 Subject: [PATCH 6/8] =?UTF-8?q?fix:=20vscode=E3=81=AE=E8=A8=AD=E5=AE=9A?= =?UTF-8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/settings.json | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/vscode/settings.json b/vscode/settings.json index 07d3270..b0b7040 100644 --- a/vscode/settings.json +++ b/vscode/settings.json @@ -38,10 +38,7 @@ "makefile.configureOnOpen": false, "notebook.insertFinalNewline": true, "diffEditor.ignoreTrimWhitespace": false, - "dart.flutterSdkPaths": [ - "/Users/satoshi.nosaka/.asdf/installs/flutter/3.24.4-stable" - ], - "dart.flutterSdkPath": "/Users/satoshi.nosaka/flutter", + "dart.flutterSdkPath": "/Users/satoshi.nosaka/dotfiles/asdf/installs/flutter/3.29.2-stable", "editor.minimap.enabled": false, "workbench.startupEditor": "none", "editor.accessibilitySupport": "off", @@ -51,4 +48,4 @@ "editor.inlineSuggest.suppressSuggestions": true, "cody.debug.verbose": true, "cody.suggestions.mode": "auto-edit" -} \ No newline at end of file +} From 3e5580635862999662595effd2df16319b63da5c Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 May 2025 00:03:02 +0900 Subject: [PATCH 7/8] =?UTF-8?q?add:=20vscode=E3=81=AE=E6=8B=A1=E5=BC=B5?= =?UTF-8?q?=E6=A9=9F=E8=83=BD=E3=82=92=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vscode/extensions.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/vscode/extensions.txt b/vscode/extensions.txt index be5ca64..8772edf 100644 --- a/vscode/extensions.txt +++ b/vscode/extensions.txt @@ -1,6 +1,7 @@ aaron-bond.better-comments adelphes.android-dev-ext akamud.vscode-theme-onedark +aksharpatel47.vscode-flutter-helper alexisvt.flutter-snippets antonydalmiere.android-support arjun.swagger-viewer @@ -18,16 +19,19 @@ docker.docker donjayamanne.githistory dsznajder.es7-react-js-snippets eamodio.gitlens +esafirm.kotlin-formatter esbenp.prettier-vscode fwcd.kotlin github.codespaces github.copilot github.copilot-chat +github.vscode-github-actions gruntfuggly.todo-tree intellsmi.comment-translate ionutvmi.path-autocomplete koichisasada.vscode-rdbg marcelovelasquez.flutter-tree +mathiasfrohlich.kotlin mhutchie.git-graph misogi.ruby-rubocop mosapride.zenkaku @@ -45,7 +49,9 @@ numso.prettier-standard-vscode pkief.material-icon-theme rebornix.ruby redhat.vscode-yaml +ricardo-emerson.flutter-print ritwickdey.liveserver +robert-brunhage.flutter-riverpod-snippets shopify.ruby-extensions-pack shopify.ruby-lsp sianglim.slim From 0673e494eb948ee57bee01a9d1c32800949a2333 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Thu, 15 May 2025 00:03:42 +0900 Subject: [PATCH 8/8] =?UTF-8?q?fix:=20asdf=E3=81=AE=E7=92=B0=E5=A2=83?= =?UTF-8?q?=E5=A4=89=E6=95=B0=E5=91=A8=E3=82=8A=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- zsh/.zshrc | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index 696bc0e..921987b 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -16,9 +16,14 @@ precmd () { vcs_info } # ASDF export ASDF_DATA_DIR="$HOME/dotfiles/asdf" -export PATH="${ASDF_DATA_DIR:-$HOME/.asdf}/shims:$PATH" -fpath=(${ASDF_DATA_DIR:-$HOME/.asdf}/completions $fpath) -autoload -Uz compinit && compinit +export PATH="$ASDF_DATA_DIR/bin:$ASDF_DATA_DIR/shims:$PATH" +if [ -f "$ASDF_DATA_DIR/asdf.sh" ]; then + . "$ASDF_DATA_DIR/asdf.sh" +fi +if [ -f "$ASDF_DATA_DIR/completions/asdf.zsh" ]; then + fpath=("$ASDF_DATA_DIR/completions" $fpath) + autoload -Uz compinit && compinit +fi # Android SDK export ANDROID_HOME=$HOME/dotfiles/android/sdk