Merge pull request #28 from dev-satoshi/fix

修正したり追加したりいろいろ

Author: dev-satoshi

install.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env zsh
 set -euo pipefail
 
 INSTALL_DIR="$HOME/dotfiles"

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」のセットアップが完了しました"

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"

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」のセットアップが完了しました"

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

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",
@@ -34,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",
@@ -47,4 +48,4 @@
   "editor.inlineSuggest.suppressSuggestions": true,
   "cody.debug.verbose": true,
   "cody.suggestions.mode": "auto-edit"
-}
+}

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