updated for sonoma

takameron · Mar 23, 2024 · ff0dbce · ff0dbce
1 parent 6e9e862
commit ff0dbce
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 70 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -12,4 +12,4 @@ jobs:
       - name: Run ShellCheck
         uses: ludeeus/action-shellcheck@master
         env:
-          SHELLCHECK_OPTS: -e SC1071
+          SHELLCHECK_OPTS: -e SC1071,SC2016
diff --git a/1_homebrew/Brewfile b/1_homebrew/Brewfile
@@ -1,36 +1,20 @@
 tap "homebrew/cask-versions"
-tap "homebrew/cask-drivers"
 tap "homebrew/cask-fonts"
 
 brew "coreutils"
-brew "curl"
-brew "wget"
-brew "git"
-brew "tree"
-brew "gpg"
-brew "pinentry-mac"
-brew "imagemagick"
-brew "ffmpeg"
-brew "qpdf"
 brew "hugo"
-brew "golang"
 brew "shellcheck"
 brew "mas"
 brew "asdf"
 
 cask "adguard"
-cask "affinity-designer"
-cask "affinity-photo"
-cask "affinity-publisher"
 cask "authy"
 cask "blackhole-2ch"
 cask "clip-studio-paint"
 cask "discord"
 cask "firefox"
 cask "gnucash"
 cask "google-chrome"
-cask "google-japanese-ime"
-cask "gpg-suite-no-mail"
 cask "microsoft-office"
 cask "notion"
 cask "openinterminal"
@@ -39,11 +23,8 @@ cask "spotify"
 cask "surfshark"
 cask "thunderbird"
 cask "visual-studio-code"
-cask "vmware-fusion"
-cask "zoom"
-# drivers
 cask "wacom-tablet"
-cask "yubico-yubikey-manager"
+cask "zoom"
 # fonts
 cask "font-latin-modern"
 cask "font-latin-modern-math"
@@ -52,6 +33,3 @@ mas "Bitwarden", id: 1352778147
 mas "Keepa - Price Tracker", id: 1533805339
 mas "Microsoft To Do",id: 1274495053
 mas "Mia Translate", id: 1500605326
-mas "Keynote", id: 409183694
-mas "Numbers", id: 409203825
-mas "Pages", id: 409201541
diff --git a/1_homebrew/install.sh b/1_homebrew/install.sh
@@ -4,6 +4,8 @@
 if ! (type brew > /dev/null 2>&1); then
   xcode-select --install
   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+  (echo; echo 'eval "$(/opt/homebrew/bin/brew shellenv)"') >> ~/.zprofile
+  eval "$(/opt/homebrew/bin/brew shellenv)"
 fi
 
 # 権限設定
@@ -15,26 +17,13 @@ cd "$PWD"/1_homebrew || exit
 brew bundle
 cd - || exit
 
-
-# pinentry-mac
-mkdir ~/.gnupg
-echo "pinentry-program /usr/local/bin/pinentry-mac" > ~/.gnupg/gpg-agent.conf
-gpgconf --kill gpg-agent
-
 s_path=""
 s_manpath=""
 
 # coreutils
 s_path="/usr/local/opt/coreutils/libexec/gnubin:${s_path}"
 s_manpath="/usr/local/opt/coreutils/libexec/gnuman:${s_manpath}"
 
-# curl
-s_path="/usr/local/opt/curl/bin:${s_path}"
-
-# gnu-tar
-s_path="/usr/local/opt/gnu-tar/libexec/gnubin:${s_path}"
-s_manpath="/usr/local/opt/gnu-tar/libexec/gnuman:${s_manpath}"
-
 #shellcheck disable=SC2016
 echo "export PATH=\"${s_path}"'$PATH"' >> ~/.zshrc
 #shellcheck disable=SC2016

diff --git a/2_asdf/.default-gems b/2_asdf/.default-gems
diff --git a/2_asdf/install.sh b/2_asdf/install.sh
@@ -33,14 +33,4 @@ asdf plugin-add python https://github.com/danhper/asdf-python
 asdf install python latest
 asdf global python "$(asdf list python | tail -1 | sed -e 's/ //g')"
 
-# === asdf-ruby ===
-# Requirements(optional, but recommended)
-brew install openssl readline
-echo "export RUBY_CONFIGURE_OPTS=\"--with-openssl-dir=\"$(brew --prefix openssl@1.1)\"\"" >> ~/.zshrc
-# Install plugin
-asdf plugin-add ruby https://github.com/asdf-vm/asdf-ruby.git
-# Install Ruby
-asdf install ruby latest
-asdf global ruby "$(asdf list ruby | tail -1 | sed -e 's/ //g')"
-
 echo "👍 asdf install is done!"
diff --git a/3_macos/install.sh b/3_macos/install.sh
@@ -33,27 +33,10 @@ defaults write com.apple.dock show-recents -bool false
 killall Dock
 
 # --- SystemUIServer関係 ---
-# 時計で日付を表示（例：9月20日(木) 23:00）
-defaults write com.apple.menuextra.clock DateFormat -string 'EEE MMM d HH:mm:ss'
-# バッテリーの割合（%）を表示
-defaults write com.apple.menuextra.battery ShowPercent -string "YES"
 # スクリーンショットのドロップシャドウを付けない
 defaults write com.apple.screencapture disable-shadow -bool true
 killall SystemUIServer
 
-# --- Safari ---
-# アドレスバーに完全な URL を表示
-defaults write com.apple.Safari ShowFullURLInSmartSearchField -bool true
-# ファイルのダウンロード後に自動でファイルを開くのを無効化
-defaults write com.apple.Safari AutoOpenSafeDownloads -bool false
-# メニューバーに「開発」を表示
-defaults write com.apple.Safari IncludeDevelopMenu -bool true
-# デバッグメニューをオン
-defaults write com.apple.Safari IncludeInternalDebugMenu -bool true
-# ステータスバーを表示
-defaults write com.apple.Safari ShowStatusBar -bool true
-killall Safari
-
 # ---　TextEdit　---
 # リッチテキストから標準テキストに変更
 defaults write com.apple.TextEdit RichText -int 0

diff --git a/4_dotfiles/.gitconfig b/4_dotfiles/.gitconfig
@@ -21,4 +21,4 @@
 
 [user]
 	name = takameron
-	email = contact@takameron.info
+	email = tech@takameron.info
diff --git a/4_dotfiles/install.sh b/4_dotfiles/install.sh
@@ -4,7 +4,7 @@
 basename -a "$PWD"/4_dotfiles/.??* | xargs -I{} ln -sfv "$PWD"/4_dotfiles/{} ~/{}
 
 # Zinit (Zsh plugin manager)
-sh -c "$(curl -fsSL https://git.io/zinit-install)"
+bash -c "$(curl --fail --show-error --silent --location https://raw.githubusercontent.com/zdharma-continuum/zinit/HEAD/scripts/install.sh)"
 echo ". $PWD/4_dotfiles/.plugins.zsh" >> ~/.zshrc
 
 # Delete .DS_Store

diff --git a/5_vscode/install.sh b/5_vscode/install.sh
@@ -9,16 +9,15 @@ if ! (type code > /dev/null 2>&1); then
 fi
 
 # settings.jsonの設置
+mkdir -p ~/Library/Application\ Support/Code/User
 ln -sfv "$PWD"/5_vscode/settings.json ~/Library/Application\ Support/Code/User/
 
 # プラグインのインストール
 pkglist=(
   ms-ceintl.vscode-language-pack-ja # Japanese Language Pack for Visual Studio Code
   ms-vscode-remote.remote-ssh-edit # Remote - SSH: Editing Configuration Files
   gruntfuggly.todo-tree # Todo Tree
-  wakatime.vscode-wakatime # WakaTime
   editorconfig.editorconfig # EditorConfig for VS Code
-  ms-vscode.cpptools # C/C++
 )
 
 for i in "${pkglist[@]}"; do

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ thanks https://github.com/zzzmisa/dotfiles-mac/
 * Git・Vim・VS Code・Zshの設定
 
 ## 動作確認環境
-* macOS Monterey 12.3
+* macOS Sonoma 14.4
 
 ## 事前準備
 1. App Storeにサインイン