From e3687d78e78dc03fb714f7461f71ac6f1b4fc27a Mon Sep 17 00:00:00 2001 From: Keisuke Nakayama Date: Wed, 31 May 2023 02:02:20 +0900 Subject: [PATCH 1/6] Use id_ed25519 --- .ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ssh/config b/.ssh/config index 7d622d2..b0e4140 100644 --- a/.ssh/config +++ b/.ssh/config @@ -5,7 +5,7 @@ Host * IgnoreUnknown UseKeychain UseKeychain yes AddKeysToAgent yes - IdentityFile ~/.ssh/id_rsa + IdentityFile ~/.ssh/id_ed25519 Host github HostName github.com User git From fbac0db918602ac1150c1448515519c3cce529e1 Mon Sep 17 00:00:00 2001 From: Keisuke Nakayama Date: Wed, 31 May 2023 02:03:05 +0900 Subject: [PATCH 2/6] insteadOf https://github.com (for go mod) --- .config/git/config | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.config/git/config b/.config/git/config index 88f824f..34dae52 100644 --- a/.config/git/config +++ b/.config/git/config @@ -26,6 +26,8 @@ root = ~/src [log] date = format:%Y/%m/%d %H:%M:%S +[url "ssh://git@github.com/"] + insteadOf = https://github.com/ [alias] a = add au = "add -u" # add tracked files From 21345b45691f9e5b40f6a9a9a2eae4dfc4a59e53 Mon Sep 17 00:00:00 2001 From: Keisuke Nakayama Date: Wed, 31 May 2023 02:04:20 +0900 Subject: [PATCH 3/6] Update brew packages for mba2020 --- .config/homebrew/Brewfile.mba2020.local | 153 ++++-------------------- 1 file changed, 22 insertions(+), 131 deletions(-) diff --git a/.config/homebrew/Brewfile.mba2020.local b/.config/homebrew/Brewfile.mba2020.local index d900521..33ebac2 100644 --- a/.config/homebrew/Brewfile.mba2020.local +++ b/.config/homebrew/Brewfile.mba2020.local @@ -2,147 +2,38 @@ 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" -brew "act" -brew "jpeg-xl" -brew "aom" -brew "apr-util" -brew "boost" -brew "readline" -brew "python@3.11" -brew "awscli" -brew "bash" -brew "bat" -brew "glib" -brew "python@3.9" -brew "cmake" -brew "colordiff" -brew "libidn2" -brew "freetds" +brew "autoconf" +brew "automake" +brew "bison" 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 "fzf" +brew "gettext" +brew "openssl@1.1" +brew "curl" +brew "freetype" +brew "readline" brew "gawk" -brew "gh" -brew "ghostscript" -brew "ghq" +brew "gd" 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 "jq" -brew "libmpc" -brew "libraqm" -brew "libslirp" +brew "icu4c" +brew "jpeg" +brew "krb5" +brew "libedit" +brew "libiconv" +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 "php@7.4" -brew "pillow" -brew "pyenv" -brew "python@3.10" -brew "ruby-build" -brew "rbenv" -brew "recode" -brew "rename" -brew "ripgrep" +brew "libzip" +brew "neovim" +brew "oniguruma" +brew "openssl@3" +brew "pkg-config" +brew "re2c" 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" 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 From 88a427b24895759f83daf03aedaea11f08d528b7 Mon Sep 17 00:00:00 2001 From: Keisuke Nakayama Date: Wed, 31 May 2023 02:05:07 +0900 Subject: [PATCH 4/6] Fix script for asdf --- setup-asdf.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup-asdf.sh b/setup-asdf.sh index 6f16286..6d5e945 100755 --- a/setup-asdf.sh +++ b/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 openssl@1.1 pkg-config re2c zlib + brew install autoconf automake bison freetype gd gettext icu4c krb5 libedit libiconv libjpeg libpng libxml2 libzip openssl@1.1 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' From 1331a4a04f6a49ef65a8538900501da395e4a7ee Mon Sep 17 00:00:00 2001 From: Keisuke Nakayama Date: Wed, 31 May 2023 02:07:43 +0900 Subject: [PATCH 5/6] Update .zprofile --- .zprofile | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/.zprofile b/.zprofile index 57b9add..559aaf1 100644 --- a/.zprofile +++ b/.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 From 12eedbdfd9e49d259873f17dc776be93e95b974d Mon Sep 17 00:00:00 2001 From: Keisuke Nakayama Date: Sun, 18 Aug 2024 16:21:21 +0900 Subject: [PATCH 6/6] merge --- .bashrc | 1 + .config/git/config | 2 +- .config/homebrew/Brewfile.mba2020.local | 53 +++++++++++++++++++++---- .config/zsh/alias.zsh | 4 ++ .ssh/config | 3 ++ .vimrc | 1 + .zshenv | 6 +++ 7 files changed, 62 insertions(+), 8 deletions(-) diff --git a/.bashrc b/.bashrc index e20db81..288c7a4 100644 --- a/.bashrc +++ b/.bashrc @@ -4,3 +4,4 @@ if [ -e ~/.git-prompt.sh ]; then # プロンプト表示前に、ブランチ名をPS1に代入する PROMPT_COMMAND='__git_ps1 "[\u@\h \t \w" "]\\\$ "' fi +. "$HOME/.cargo/env" diff --git a/.config/git/config b/.config/git/config index b853d7f..dc0a131 100644 --- a/.config/git/config +++ b/.config/git/config @@ -19,7 +19,7 @@ [core] editor = vim quotepath = false - pager = git-split-diffs --color | less -RFX +# pager = git-split-diffs --color | less -RFX [commit] verbose = true [ghq] diff --git a/.config/homebrew/Brewfile.mba2020.local b/.config/homebrew/Brewfile.mba2020.local index 33ebac2..3c1be0f 100644 --- a/.config/homebrew/Brewfile.mba2020.local +++ b/.config/homebrew/Brewfile.mba2020.local @@ -1,39 +1,78 @@ +tap "ariga/tap" tap "basd4g/tap" tap "charmbracelet/tap" tap "heroku/brew" tap "homebrew/bundle" tap "homebrew/cask-fonts" +tap "homebrew/services" +tap "k1low/tap" +tap "kayac/tap" +brew "act" +brew "atlas" brew "autoconf" brew "automake" +brew "python@3.11" +brew "awscli" brew "bison" +brew "pycparser" +brew "cffi" +brew "cloudflared" brew "gmp" brew "coreutils" brew "gettext" -brew "openssl@1.1" +brew "libssh2" brew "curl" +brew "direnv" +brew "docutils" +brew "flyctl" brew "freetype" -brew "readline" +brew "fzf" brew "gawk" brew "gd" +brew "ghq" brew "git" -brew "icu4c" +brew "goenv", args: ["HEAD"] brew "jpeg" -brew "krb5" +brew "oniguruma" +brew "jq" brew "libedit" +brew "libfido2" brew "libiconv" +brew "libpq" brew "libsodium" brew "libxml2" brew "libyaml" brew "libzip" +brew "mkcert" +brew "mysql" brew "neovim" -brew "oniguruma" -brew "openssl@3" +brew "nss" +brew "php" brew "pkg-config" +brew "pnpm" brew "re2c" +brew "redis" brew "rust" brew "tmux" +brew "tree" brew "yadm" -brew "zlib" +brew "k1low/tap/runn" +brew "kayac/tap/ecspresso" cask "alacritty" cask "font-hackgen" cask "font-hackgen-nerd" +cask "karabiner-elements" +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" diff --git a/.config/zsh/alias.zsh b/.config/zsh/alias.zsh index f3be8a2..19dd671 100644 --- a/.config/zsh/alias.zsh +++ b/.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/' @@ -97,3 +98,6 @@ function mknow() { function random() { date | sha1sum | awk '{ print $1 }' | tee /dev/stderr | cpy } +function dotenv() { + eval "$(cat .env <(echo) <(declare -x))" +} diff --git a/.ssh/config b/.ssh/config index 1bc5468..47bd1c8 100644 --- a/.ssh/config +++ b/.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 diff --git a/.vimrc b/.vimrc index b0127f3..007ad92 100644 --- a/.vimrc +++ b/.vimrc @@ -31,3 +31,4 @@ set softtabstop=2 " タブキー押下時に挿入される文字幅を指定 set shiftwidth=2 " インデント幅 set tabstop=2 " タブ文字の表示幅 set nobomb +colorscheme pablo diff --git a/.zshenv b/.zshenv index ddff0e2..d9e016e 100644 --- a/.zshenv +++ b/.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"