From 37976f1f66f779e26b4480af7e7f4b0fcd5e2e2f Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Wed, 14 May 2025 12:16:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20setup=E9=85=8D=E4=B8=8B?= =?UTF-8?q?=E3=81=AB=E3=82=BB=E3=83=83=E3=83=88=E3=82=A2=E3=83=83=E3=83=97?= =?UTF-8?q?=E3=82=B9=E3=82=AF=E3=83=AA=E3=83=97=E3=83=88=E3=82=92=E7=A7=BB?= =?UTF-8?q?=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- install.sh | 2 +- scripts/setup.sh | 15 --------------- scripts/{ => setup}/android_setup.sh | 0 scripts/{ => setup}/asdf_setup.sh | 0 scripts/{ => setup}/homebrew_setup.sh | 0 scripts/{ => setup}/link_dotfiles.sh | 0 scripts/setup/setup.sh | 15 +++++++++++++++ scripts/{ => setup}/vscode_setup.sh | 0 scripts/{ => setup}/xcode_setup.sh | 0 9 files changed, 16 insertions(+), 16 deletions(-) delete mode 100644 scripts/setup.sh 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 (100%) create mode 100644 scripts/setup/setup.sh rename scripts/{ => setup}/vscode_setup.sh (100%) rename scripts/{ => setup}/xcode_setup.sh (100%) diff --git a/install.sh b/install.sh index 756eab3..30e524c 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.sh" +sh "$INSTALL_DIR/scripts/setup/setup.sh" diff --git a/scripts/setup.sh b/scripts/setup.sh deleted file mode 100644 index d9b1bae..0000000 --- a/scripts/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/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/android_setup.sh b/scripts/setup/android_setup.sh similarity index 100% rename from scripts/android_setup.sh rename to scripts/setup/android_setup.sh diff --git a/scripts/asdf_setup.sh b/scripts/setup/asdf_setup.sh similarity index 100% rename from scripts/asdf_setup.sh rename to scripts/setup/asdf_setup.sh diff --git a/scripts/homebrew_setup.sh b/scripts/setup/homebrew_setup.sh similarity index 100% rename from scripts/homebrew_setup.sh rename to scripts/setup/homebrew_setup.sh diff --git a/scripts/link_dotfiles.sh b/scripts/setup/link_dotfiles.sh similarity index 100% rename from scripts/link_dotfiles.sh rename to scripts/setup/link_dotfiles.sh diff --git a/scripts/setup/setup.sh b/scripts/setup/setup.sh new file mode 100644 index 0000000..ce673ac --- /dev/null +++ b/scripts/setup/setup.sh @@ -0,0 +1,15 @@ +#!/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/vscode_setup.sh b/scripts/setup/vscode_setup.sh similarity index 100% rename from scripts/vscode_setup.sh rename to scripts/setup/vscode_setup.sh diff --git a/scripts/xcode_setup.sh b/scripts/setup/xcode_setup.sh similarity index 100% rename from scripts/xcode_setup.sh rename to scripts/setup/xcode_setup.sh From 7eeaf5c9b16b23050135bee5690c81fa6c4c1c08 Mon Sep 17 00:00:00 2001 From: dev-satoshi Date: Wed, 14 May 2025 12:24:57 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20config=E9=85=8D=E4=B8=8B?= =?UTF-8?q?=E3=81=AB=E8=A8=AD=E5=AE=9A=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 16 +++++++-------- {android => config/android}/.gitkeep | 0 {asdf => config/asdf}/.tool-versions | 0 {asdf => config/asdf}/plugins.txt | 0 {aws => config/aws}/config | 0 {git => config/git}/.gitattributes | 0 {git => config/git}/.gitconfig | 0 {git => config/git}/.gitignore | 0 {homebrew => config/homebrew}/Brewfile | 0 {vscode => config/vscode}/extensions.txt | 0 {vscode => config/vscode}/settings.json | 26 ++++++++++++++++++------ {zsh => config/zsh}/.zshenv | 0 {zsh => config/zsh}/.zshrc | 0 scripts/setup/link_dotfiles.sh | 18 ++++++++-------- 14 files changed, 37 insertions(+), 23 deletions(-) rename {android => config/android}/.gitkeep (100%) rename {asdf => config/asdf}/.tool-versions (100%) rename {asdf => config/asdf}/plugins.txt (100%) rename {aws => config/aws}/config (100%) rename {git => config/git}/.gitattributes (100%) rename {git => config/git}/.gitconfig (100%) rename {git => config/git}/.gitignore (100%) rename {homebrew => config/homebrew}/Brewfile (100%) rename {vscode => config/vscode}/extensions.txt (100%) rename {vscode => config/vscode}/settings.json (78%) rename {zsh => config/zsh}/.zshenv (100%) rename {zsh => config/zsh}/.zshrc (100%) diff --git a/.gitignore b/.gitignore index 473fe78..5c5ab6b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,17 +9,17 @@ local.* .ssh ### ASDF ### -/asdf/* -!/asdf/.tool-versions -!/asdf/plugins.txt +config/asdf/* +!/config/asdf/.tool-versions +!/config/asdf/plugins.txt ### Android ### -/android/sdk/ -/.android/ -/local.properties +config/android/sdk/ +config/.android/ +config/local.properties *.iml -/.idea/ +config/.idea/ /.gradle/ ### AWS ### -aws/credentials +config/aws/credentials diff --git a/android/.gitkeep b/config/android/.gitkeep similarity index 100% rename from android/.gitkeep rename to config/android/.gitkeep diff --git a/asdf/.tool-versions b/config/asdf/.tool-versions similarity index 100% rename from asdf/.tool-versions rename to config/asdf/.tool-versions diff --git a/asdf/plugins.txt b/config/asdf/plugins.txt similarity index 100% rename from asdf/plugins.txt rename to config/asdf/plugins.txt diff --git a/aws/config b/config/aws/config similarity index 100% rename from aws/config rename to config/aws/config diff --git a/git/.gitattributes b/config/git/.gitattributes similarity index 100% rename from git/.gitattributes rename to config/git/.gitattributes diff --git a/git/.gitconfig b/config/git/.gitconfig similarity index 100% rename from git/.gitconfig rename to config/git/.gitconfig diff --git a/git/.gitignore b/config/git/.gitignore similarity index 100% rename from git/.gitignore rename to config/git/.gitignore diff --git a/homebrew/Brewfile b/config/homebrew/Brewfile similarity index 100% rename from homebrew/Brewfile rename to config/homebrew/Brewfile diff --git a/vscode/extensions.txt b/config/vscode/extensions.txt similarity index 100% rename from vscode/extensions.txt rename to config/vscode/extensions.txt diff --git a/vscode/settings.json b/config/vscode/settings.json similarity index 78% rename from vscode/settings.json rename to config/vscode/settings.json index 1801768..374a78e 100644 --- a/vscode/settings.json +++ b/config/vscode/settings.json @@ -1,8 +1,12 @@ { "workbench.colorTheme": "Atom One Dark", + "workbench.iconTheme": "material-icon-theme", "editor.fontSize": 16, "terminal.integrated.fontSize": 14, - "workbench.iconTheme": "material-icon-theme", + "files.insertFinalNewline": true, + "files.trimTrailingWhitespace": true, + "files.trimFinalNewlines": true, + "explorer.compactFolders": false, "[ruby]": { "editor.defaultFormatter": "Shopify.ruby-lsp", "editor.formatOnSave": true, @@ -16,7 +20,6 @@ ], "editor.semanticHighlighting.enabled": true }, - "explorer.compactFolders": false, "javascript.updateImportsOnFileMove.enabled": "never", "[typescriptreact]": { "editor.defaultFormatter": "esbenp.prettier-vscode" @@ -24,9 +27,7 @@ "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", @@ -38,6 +39,10 @@ "/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", @@ -46,5 +51,14 @@ "diffEditor.codeLens": true, "editor.inlineSuggest.suppressSuggestions": true, "cody.debug.verbose": true, - "cody.suggestions.mode": "auto-edit" -} \ No newline at end of file + "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 +} diff --git a/zsh/.zshenv b/config/zsh/.zshenv similarity index 100% rename from zsh/.zshenv rename to config/zsh/.zshenv diff --git a/zsh/.zshrc b/config/zsh/.zshrc similarity index 100% rename from zsh/.zshrc rename to config/zsh/.zshrc diff --git a/scripts/setup/link_dotfiles.sh b/scripts/setup/link_dotfiles.sh index c1f2567..ea81e52 100644 --- a/scripts/setup/link_dotfiles.sh +++ b/scripts/setup/link_dotfiles.sh @@ -7,15 +7,15 @@ DOTFILES_DIR="$HOME/dotfiles" # リンクを作成するファイル一覧（キー：シンボリックリンク先、値：dotfiles内の実ファイル） LINKS=( - "$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" + "$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" ) # すべてのリンクを作成