Merge branch 'main' of github.com:yammerjp/dotfiles

.bashrc

@@ -4,3 +4,4 @@ if [ -e ~/.git-prompt.sh ]; then
   # プロンプト表示前に、ブランチ名をPS1に代入する
   PROMPT_COMMAND='__git_ps1 "[\u@\h \t \w" "]\\\$ "'
 fi
+. "$HOME/.cargo/env"

.config/git/config

@@ -19,13 +19,15 @@
 [core]
 	editor = vim
 	quotepath = false
-	pager = git-split-diffs --color | less -RFX
+#	pager = git-split-diffs --color | less -RFX
 [commit]
 	verbose = true
 [ghq]
 	root = ~/src
 [log]
 	date = format:%Y/%m/%d %H:%M:%S
+[url "ssh://[email protected]/"]
+	insteadOf = https://github.com/
 [alias]
 	a = add
 	au = "add -u" # add tracked files

.config/homebrew/Brewfile.mba2020.local

@@ -1,148 +1,78 @@
+tap "ariga/tap"
 tap "basd4g/tap"
 tap "charmbracelet/tap"
 tap "heroku/brew"
 tap "homebrew/bundle"
-tap "homebrew/cask"
-tap "homebrew/cask-drivers"
 tap "homebrew/cask-fonts"
-tap "homebrew/core"
-tap "olets/tap"
-tap "osx-cross/arm"
-tap "osx-cross/avr"
-tap "qmk/qmk"
-tap "rhysd/hgrep", "https://github.com/rhysd/hgrep"
-tap "yammerjp/tap"
+tap "homebrew/services"
+tap "k1low/tap"
+tap "kayac/tap"
 brew "act"
-brew "jpeg-xl"
-brew "aom"
-brew "apr-util"
-brew "boost"
-brew "readline"
+brew "atlas"
+brew "autoconf"
+brew "automake"
 brew "[email protected]"
 brew "awscli"
-brew "bash"
-brew "bat"
-brew "glib"
-brew "[email protected]"
-brew "cmake"
-brew "colordiff"
-brew "libidn2"
-brew "freetds"
+brew "bison"
+brew "pycparser"
+brew "cffi"
+brew "cloudflared"
 brew "gmp"
-brew "libpq"
-brew "php"
-brew "composer"
 brew "coreutils"
-brew "deno"
-brew "docker"
-brew "dog"
-brew "unbound"
-brew "gnutls"
-brew "emacs"
-brew "fd"
-brew "harfbuzz"
-brew "libass"
-brew "pango"
-brew "srt"
-brew "tesseract"
-brew "ffmpeg"
-brew "fish"
+brew "gettext"
+brew "libssh2"
+brew "curl"
+brew "direnv"
+brew "docutils"
+brew "flyctl"
+brew "freetype"
 brew "fzf"
 brew "gawk"
-brew "gh"
-brew "ghostscript"
+brew "gd"
 brew "ghq"
 brew "git"
-brew "git-filter-repo"
-brew "glow"
-brew "gnu-sed"
-brew "gnupg"
-brew "go"
-brew "gobject-introspection"
-brew "golangci-lint"
-brew "goreleaser"
-brew "httrack"
-brew "hugo"
-brew "libheif"
-brew "libraw"
-brew "imagemagick"
-brew "imagemagick@6"
-brew "jhead"
+brew "goenv", args: ["HEAD"]
+brew "jpeg"
+brew "oniguruma"
 brew "jq"
-brew "libmpc"
-brew "libraqm"
-brew "libslirp"
+brew "libedit"
+brew "libfido2"
+brew "libiconv"
+brew "libpq"
+brew "libsodium"
+brew "libxml2"
 brew "libyaml"
-brew "qemu"
-brew "lima"
-brew "lsd"
-brew "luv"
-brew "mas"
-brew "neovim", args: ["HEAD"]
-brew "nkf"
-brew "nmap"
-brew "node"
-brew "openssl@3", link: true
-brew "node-build"
-brew "nodenv"
-brew "[email protected]"
-brew "pillow"
-brew "pyenv"
-brew "[email protected]"
-brew "ruby-build"
-brew "rbenv"
-brew "recode"
-brew "rename"
-brew "ripgrep"
+brew "libzip"
+brew "mkcert"
+brew "mysql"
+brew "neovim"
+brew "nss"
+brew "php"
+brew "pkg-config"
+brew "pnpm"
+brew "re2c"
+brew "redis"
 brew "rust"
-brew "sd"
-brew "sheldon"
-brew "shellcheck"
-brew "sl"
-brew "socat"
-brew "t-rec"
-brew "tbls"
-brew "tealdeer"
-brew "tig"
 brew "tmux"
 brew "tree"
-brew "ttyd"
-brew "twty"
-brew "vhs"
-brew "wget"
-brew "wireshark"
-brew "xq"
 brew "yadm"
-brew "yq"
-brew "zellij"
-brew "zlib"
-brew "zoxide"
-brew "basd4g/tap/pdef"
-brew "heroku/brew/heroku"
-brew "olets/tap/zsh-abbr"
-brew "qmk/qmk/qmk"
-brew "rhysd/hgrep/hgrep"
-brew "yammerjp/tap/db-time-traveler"
+brew "k1low/tap/runn"
+brew "kayac/tap/ecspresso"
 cask "alacritty"
-cask "chromium"
-cask "discord"
-cask "font-hack-nerd-font"
 cask "font-hackgen"
 cask "font-hackgen-nerd"
 cask "karabiner-elements"
-cask "keycastr"
-cask "macfuse"
-cask "multipass"
-cask "scroll-reverser"
-cask "sequel-ace"
-cask "visual-studio-code"
-cask "vivaldi"
-mas "1Password 7", id: 1333542190
-mas "ForkLift", id: 412448059
-mas "Free Ruler", id: 1483172210
-mas "Kindle", id: 405399194
-mas "Magnet", id: 441258766
-mas "Microsoft Remote Desktop", id: 1295203466
-mas "Slack", id: 803453959
-mas "Tailscale", id: 1475387142
-mas "virtualOS", id: 1614659226
+vscode "github.copilot"
+vscode "github.copilot-chat"
+vscode "github.vscode-github-actions"
+vscode "golang.go"
+vscode "grafana.vscode-jsonnet"
+vscode "graphql.vscode-graphql-syntax"
+vscode "hashicorp.terraform"
+vscode "luggage66.awk"
+vscode "ms-azuretools.vscode-docker"
+vscode "ms-ceintl.vscode-language-pack-ja"
+vscode "ms-vscode-remote.remote-containers"
+vscode "ms-vscode.makefile-tools"
+vscode "vscodevim.vim"
+vscode "vue.volar"

.config/zsh/alias.zsh

@@ -1,5 +1,6 @@
 alias du='du -h'
 alias vi='vim -u NONE'
+alias vim='nvim'
 alias tree='tree -N'
 alias search='find . -type f | grep -v "/.git/" | xargs grep'
 alias covid19='curl https://corona-stats.online/'
@@ -102,3 +103,7 @@ function random() {
 function op-to-env-file() {
   op item get "$1" --format json  | jq -r '.fields[] | select(.value) | (.label) + "=" + (.reference)'
 }
+
+function dotenv() {
+  eval "$(cat .env <(echo) <(declare -x))"
+}

.ssh/config

@@ -9,3 +9,6 @@ Host *
 Host github
   HostName github.com
   User git
+Host ssh.mc.lolipop.jp
+  IdentityFile ~/.ssh/id_ed25519_mc
+  User git

.vimrc

@@ -31,3 +31,4 @@ set softtabstop=2 " タブキー押下時に挿入される文字幅を指定
 set shiftwidth=2 " インデント幅
 set tabstop=2 " タブ文字の表示幅
 set nobomb
+colorscheme pablo

.zprofile

@@ -2,11 +2,12 @@ if [ -f ~/.zshrc ] && [ "$LOADED_ZSHRC" != "true" ] ; then
   . ~/.zshrc
 fi
 
-##
-# Your previous /Users/yammer/.zprofile file was backed up as /Users/yammer/.zprofile.macports-saved_2022-12-02_at_04:51:21
-##
-
-# MacPorts Installer addition on 2022-12-02_at_04:51:21: adding an appropriate PATH variable for use with MacPorts.
-export PATH="/opt/local/bin:/opt/local/sbin:$PATH"
 # Finished adapting your PATH environment variable for use with MacPorts.
-
+if [ -e "/opt/homebrew" ]; then
+  export HOMEBREW_PREFIX="/opt/homebrew";
+  export HOMEBREW_CELLAR="/opt/homebrew/Cellar";
+  export HOMEBREW_REPOSITORY="/opt/homebrew";
+  export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}";
+  export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:";
+  export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}";
+fi

.zshenv

@@ -10,3 +10,9 @@ fi
 if [ -e "$HOME/.config/zsh/variables.zsh" ]; then
   source $HOME/.config/zsh/variables.zsh
 fi
+
+if [ -e "$HOME/.config/zsh/asdf.zsh" ]; then
+  source $HOME/.config/zsh/asdf.zsh
+fi
+
+. "$HOME/.cargo/env"

setup-asdf.sh

@@ -36,9 +36,9 @@ if which apt-get > /dev/null; then
   sudo apt-get update -y
   sudo apt-get install -y autoconf bison build-essential curl gettext git libgd-dev libcurl4-openssl-dev libedit-dev libicu-dev libjpeg-dev libmysqlclient-dev libonig-dev libpng-dev libpq-dev libreadline-dev libsqlite3-dev libssl-dev libxml2-dev libzip-dev openssl pkg-config re2c zlib1g-dev
 elif which brew > /dev/null; then
-  brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip [email protected] pkg-config re2c zlib
+  brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip [email protected] pkg-config re2c zlib libsodium bison re2c gd libiconv libzip oniguruma
 else
-  echo "Need dependencies for ruby"
+  echo "Need dependencies for PHP"
   exit 1
 fi
 asdf plugin add php || echo 'already added plugin'