From 1e5f373e4f5c3467e4db2882f5a03a8df1c23af7 Mon Sep 17 00:00:00 2001
From: Satoshi <102169197+dev-satoshi@users.noreply.github.com>
Date: Wed, 14 May 2025 18:12:05 +0900
Subject: [PATCH] =?UTF-8?q?Revert=20"=E3=83=AA=E3=83=95=E3=82=A1=E3=82=AF?=
 =?UTF-8?q?=E3=82=BF=E3=83=AA=E3=83=B3=E3=82=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                               | 16 +++++++--------
 {config/android => android}/.gitkeep     |  0
 {config/asdf => asdf}/.tool-versions     |  0
 {config/asdf => asdf}/plugins.txt        |  0
 {config/aws => aws}/config               |  0
 {config/git => git}/.gitattributes       |  0
 {config/git => git}/.gitconfig           |  0
 {config/git => git}/.gitignore           |  0
 {config/homebrew => homebrew}/Brewfile   |  0
 install.sh                               |  2 +-
 scripts/{setup => }/android_setup.sh     |  0
 scripts/{setup => }/asdf_setup.sh        |  0
 scripts/{setup => }/homebrew_setup.sh    |  0
 scripts/{setup => }/link_dotfiles.sh     | 18 ++++++++--------
 scripts/setup.sh                         | 15 ++++++++++++++
 scripts/setup/setup.sh                   | 15 --------------
 scripts/{setup => }/vscode_setup.sh      |  0
 scripts/{setup => }/xcode_setup.sh       |  0
 {config/vscode => vscode}/extensions.txt |  0
 {config/vscode => vscode}/settings.json  | 26 ++++++------------------
 {config/zsh => zsh}/.zshenv              |  0
 {config/zsh => zsh}/.zshrc               |  0
 22 files changed, 39 insertions(+), 53 deletions(-)
 rename {config/android => android}/.gitkeep (100%)
 rename {config/asdf => asdf}/.tool-versions (100%)
 rename {config/asdf => asdf}/plugins.txt (100%)
 rename {config/aws => aws}/config (100%)
 rename {config/git => git}/.gitattributes (100%)
 rename {config/git => git}/.gitconfig (100%)
 rename {config/git => git}/.gitignore (100%)
 rename {config/homebrew => homebrew}/Brewfile (100%)
 rename scripts/{setup => }/android_setup.sh (100%)
 rename scripts/{setup => }/asdf_setup.sh (100%)
 rename scripts/{setup => }/homebrew_setup.sh (100%)
 rename scripts/{setup => }/link_dotfiles.sh (66%)
 create mode 100644 scripts/setup.sh
 delete mode 100644 scripts/setup/setup.sh
 rename scripts/{setup => }/vscode_setup.sh (100%)
 rename scripts/{setup => }/xcode_setup.sh (100%)
 rename {config/vscode => vscode}/extensions.txt (100%)
 rename {config/vscode => vscode}/settings.json (78%)
 rename {config/zsh => zsh}/.zshenv (100%)
 rename {config/zsh => zsh}/.zshrc (100%)

diff --git a/.gitignore b/.gitignore
index 5c5ab6b..473fe78 100644
--- a/.gitignore
+++ b/.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
diff --git a/config/android/.gitkeep b/android/.gitkeep
similarity index 100%
rename from config/android/.gitkeep
rename to android/.gitkeep
diff --git a/config/asdf/.tool-versions b/asdf/.tool-versions
similarity index 100%
rename from config/asdf/.tool-versions
rename to asdf/.tool-versions
diff --git a/config/asdf/plugins.txt b/asdf/plugins.txt
similarity index 100%
rename from config/asdf/plugins.txt
rename to asdf/plugins.txt
diff --git a/config/aws/config b/aws/config
similarity index 100%
rename from config/aws/config
rename to aws/config
diff --git a/config/git/.gitattributes b/git/.gitattributes
similarity index 100%
rename from config/git/.gitattributes
rename to git/.gitattributes
diff --git a/config/git/.gitconfig b/git/.gitconfig
similarity index 100%
rename from config/git/.gitconfig
rename to git/.gitconfig
diff --git a/config/git/.gitignore b/git/.gitignore
similarity index 100%
rename from config/git/.gitignore
rename to git/.gitignore
diff --git a/config/homebrew/Brewfile b/homebrew/Brewfile
similarity index 100%
rename from config/homebrew/Brewfile
rename to homebrew/Brewfile
diff --git a/install.sh b/install.sh
index 30e524c..756eab3 100644
--- a/install.sh
+++ b/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"
diff --git a/scripts/setup/android_setup.sh b/scripts/android_setup.sh
similarity index 100%
rename from scripts/setup/android_setup.sh
rename to scripts/android_setup.sh
diff --git a/scripts/setup/asdf_setup.sh b/scripts/asdf_setup.sh
similarity index 100%
rename from scripts/setup/asdf_setup.sh
rename to scripts/asdf_setup.sh
diff --git a/scripts/setup/homebrew_setup.sh b/scripts/homebrew_setup.sh
similarity index 100%
rename from scripts/setup/homebrew_setup.sh
rename to scripts/homebrew_setup.sh
diff --git a/scripts/setup/link_dotfiles.sh b/scripts/link_dotfiles.sh
similarity index 66%
rename from scripts/setup/link_dotfiles.sh
rename to scripts/link_dotfiles.sh
index ea81e52..c1f2567 100644
--- a/scripts/setup/link_dotfiles.sh
+++ b/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"
 )
 
 # すべてのリンクを作成
diff --git a/scripts/setup.sh b/scripts/setup.sh
new file mode 100644
index 0000000..d9b1bae
--- /dev/null
+++ b/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」のセットアップが完了しました"
diff --git a/scripts/setup/setup.sh b/scripts/setup/setup.sh
deleted file mode 100644
index ce673ac..0000000
--- a/scripts/setup/setup.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/env zsh
-set -euo pipefail
-
-echo "「dotfiles」のセットアップを開始しました"
-
-INSTALL_DIR="$HOME/dotfiles"
-
-sh "$INSTALL_DIR/scripts/setup/homebrew_setup.sh"
-sh "$INSTALL_DIR/scripts/setup/asdf_setup.sh"
-sh "$INSTALL_DIR/scripts/setup/vscode_setup.sh"
-sh "$INSTALL_DIR/scripts/setup/xcode_setup.sh"
-sh "$INSTALL_DIR/scripts/setup/android_setup.sh"
-sh "$INSTALL_DIR/scripts/setup/link_dotfiles.sh"
-
-echo "「dotfiles」のセットアップが完了しました"
diff --git a/scripts/setup/vscode_setup.sh b/scripts/vscode_setup.sh
similarity index 100%
rename from scripts/setup/vscode_setup.sh
rename to scripts/vscode_setup.sh
diff --git a/scripts/setup/xcode_setup.sh b/scripts/xcode_setup.sh
similarity index 100%
rename from scripts/setup/xcode_setup.sh
rename to scripts/xcode_setup.sh
diff --git a/config/vscode/extensions.txt b/vscode/extensions.txt
similarity index 100%
rename from config/vscode/extensions.txt
rename to vscode/extensions.txt
diff --git a/config/vscode/settings.json b/vscode/settings.json
similarity index 78%
rename from config/vscode/settings.json
rename to vscode/settings.json
index 374a78e..1801768 100644
--- a/config/vscode/settings.json
+++ b/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,6 +16,7 @@
     ],
     "editor.semanticHighlighting.enabled": true
   },
+  "explorer.compactFolders": false,
   "javascript.updateImportsOnFileMove.enabled": "never",
   "[typescriptreact]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -27,7 +24,9 @@
   "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"
+}
\ No newline at end of file
diff --git a/config/zsh/.zshenv b/zsh/.zshenv
similarity index 100%
rename from config/zsh/.zshenv
rename to zsh/.zshenv
diff --git a/config/zsh/.zshrc b/zsh/.zshrc
similarity index 100%
rename from config/zsh/.zshrc
rename to zsh/.zshrc