Revert "リファクタリング"

.gitignore

@@ -9,17 +9,17 @@ local.*
 .ssh
 
 ### ASDF ###
-config/asdf/*
-!/config/asdf/.tool-versions
-!/config/asdf/plugins.txt
+/asdf/*
+!/asdf/.tool-versions
+!/asdf/plugins.txt
 
 ### Android ###
-config/android/sdk/
-config/.android/
-config/local.properties
+/android/sdk/
+/.android/
+/local.properties
 *.iml
-config/.idea/
+/.idea/
 /.gradle/
 
 ### AWS ###
-config/aws/credentials
+aws/credentials

install.sh

@@ -11,4 +11,4 @@ else
   git clone https://github.com/dev-satoshi/dotfiles "$INSTALL_DIR"
 fi
 
-sh "$INSTALL_DIR/scripts/setup/setup.sh"
+sh "$INSTALL_DIR/scripts/setup.sh"

scripts/setup/link_dotfiles.sh → scripts/link_dotfiles.sh

@@ -7,15 +7,15 @@ DOTFILES_DIR="$HOME/dotfiles"
 
 # リンクを作成するファイル一覧（キー：シンボリックリンク先、値：dotfiles内の実ファイル）
 LINKS=(
-  "$DOTFILES_DIR/config/zsh/.zshrc:$HOME/.zshrc"
-  "$DOTFILES_DIR/config/zsh/.zshenv:$HOME/.zshenv"
-  "$DOTFILES_DIR/config/git/.gitconfig:$HOME/.gitconfig"
-  "$DOTFILES_DIR/config/git/.gitignore:$HOME/.gitignore"
-  "$DOTFILES_DIR/config/git/.gitattributes:$HOME/.gitattributes"
-  "$DOTFILES_DIR/config/aws/config:$HOME/.aws/config"
-  "$DOTFILES_DIR/config/vscode/settings.json:$HOME/Library/Application Support/Code/User/settings.json"
-  "$DOTFILES_DIR/config/android/sdk:$HOME/Library/Android/sdk"
-  "/opt/homebrew/share/android-commandlinetools/cmdline-tools/latest:$DOTFILES_DIR/config/android/sdk/cmdline-tools/latest"
+  "$DOTFILES_DIR/zsh/.zshrc:$HOME/.zshrc"
+  "$DOTFILES_DIR/zsh/.zshenv:$HOME/.zshenv"
+  "$DOTFILES_DIR/git/.gitconfig:$HOME/.gitconfig"
+  "$DOTFILES_DIR/git/.gitignore:$HOME/.gitignore"
+  "$DOTFILES_DIR/git/.gitattributes:$HOME/.gitattributes"
+  "$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"
+  "/opt/homebrew/share/android-commandlinetools/cmdline-tools/latest:$DOTFILES_DIR/android/sdk/cmdline-tools/latest"
 )
 
 # すべてのリンクを作成

scripts/setup.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/env zsh
+set -euo pipefail
+
+echo "「dotfiles」のセットアップを開始しました"
+
+INSTALL_DIR="$HOME/dotfiles"
+
+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」のセットアップが完了しました"

config/vscode/settings.json → vscode/settings.json

@@ -1,12 +1,8 @@
 {
   "workbench.colorTheme": "Atom One Dark",
-  "workbench.iconTheme": "material-icon-theme",
   "editor.fontSize": 16,
   "terminal.integrated.fontSize": 14,
-  "files.insertFinalNewline": true,
-  "files.trimTrailingWhitespace": true,
-  "files.trimFinalNewlines": true,
-  "explorer.compactFolders": false,
+  "workbench.iconTheme": "material-icon-theme",
   "[ruby]": {
     "editor.defaultFormatter": "Shopify.ruby-lsp",
     "editor.formatOnSave": true,
@@ -20,14 +16,17 @@
     ],
     "editor.semanticHighlighting.enabled": true
   },
+  "explorer.compactFolders": false,
   "javascript.updateImportsOnFileMove.enabled": "never",
   "[typescriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "standard.engine": "ts-standard",
   "standard.autoFixOnSave": true,
   "typescript.updateImportsOnFileMove.enabled": "never",
+  "github.copilot.editor.enableAutoCompletions": true,
   "liveServer.settings.donotShowInfoMsg": true,
+  "files.trimTrailingWhitespace": true,
   "editor.renderWhitespace": "boundary",
   "editor.fontFamily": "UDEV Gothic 35JPDOC",
   "terminal.integrated.fontFamily": "Andale Mono",
@@ -39,10 +38,6 @@
     "/Users/satoshi.nosaka/.asdf/installs/flutter/3.24.4-stable"
   ],
   "dart.flutterSdkPath": "/Users/satoshi.nosaka/flutter",
-  "dart.enableSdkFormatter": true,
-  "[dart]": {
-    "editor.formatOnSave": true
-  },
   "editor.minimap.enabled": false,
   "workbench.startupEditor": "none",
   "editor.accessibilitySupport": "off",
@@ -51,14 +46,5 @@
   "diffEditor.codeLens": true,
   "editor.inlineSuggest.suppressSuggestions": true,
   "cody.debug.verbose": true,
-  "cody.suggestions.mode": "auto-edit",
-  "github.copilot.enable": {
-    "*": true,
-    "plaintext": false,
-    "markdown": false,
-    "scminput": false
-  },
-  "gitlens.rebaseEditor.ordering": "asc",
-  "kotlin.languageServer.enabled": false,
-  "kotlin.debugAdapter.enabled": false
-}
+  "cody.suggestions.mode": "auto-edit"
+}