From 52a48280e75199038618e86ed6177d9997b535f4 Mon Sep 17 00:00:00 2001 From: Jake Jarvis Date: Wed, 4 May 2022 11:48:30 -0400 Subject: [PATCH] 1password 8 ssh integration https://developer.1password.com/docs/ssh/get-started#step-4-configure-your-ssh-or-git-client --- Brewfile | 7 +++++++ git/.gitconfig | 8 ++++---- npm/install_globals.sh | 8 ++++---- ssh/.ssh/config | 39 ++++++++++++++++++------------------ vscode/install_extensions.sh | 5 ----- zsh/.zshrc | 4 ++++ 6 files changed, 39 insertions(+), 32 deletions(-) diff --git a/Brewfile b/Brewfile index ec1a03f..a6c8fc9 100644 --- a/Brewfile +++ b/Brewfile @@ -2,6 +2,7 @@ # Taps # ############################### +tap "1password/tap" tap "adoptopenjdk/openjdk" tap "cloudflare/cloudflare" tap "dart-lang/dart" @@ -82,6 +83,7 @@ brew "git-crypt" brew "gh" # Mostly ordinary binaries +brew "1password/tap/1password-cli" brew "aws-shell" brew "awscli" brew "angular-cli" @@ -202,6 +204,11 @@ brew "hashcat" brew "nikto" brew "tcpdump" # brew "wpscanteam/tap/wpscan" # not yet compatible with M1 +brew "dnsx" +brew "httpx" +brew "naabu" +brew "nuclei" +brew "subfinder" ############################### # macOS Apps via Cask # diff --git a/git/.gitconfig b/git/.gitconfig index e9b51b7..7a7325f 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -36,10 +36,10 @@ aliases = config --get-regexp alias contributors = shortlog --summary --numbered new = !git init && git symbolic-ref HEAD refs/heads/main -[credential] - helper = osxkeychain -[gpg] - program = /usr/local/MacGPG2/bin/gpg +# [credential] +# helper = osxkeychain +# [gpg] +# program = /usr/local/MacGPG2/bin/gpg [github] user = jakejarvis [hub] diff --git a/npm/install_globals.sh b/npm/install_globals.sh index 42f5c34..ba6f206 100755 --- a/npm/install_globals.sh +++ b/npm/install_globals.sh @@ -19,25 +19,26 @@ volta list yarn # npm ls --global --parseable --depth=0 | awk '{gsub(/\/.*\//,"",$1); print}' | sort -u packages=( - @11ty/eleventy @babel/cli @babel/core @lhci/cli @vercel/ncc autoprefixer browserify + cross-env + cross-env-shell dtslint dts-gen + esbuild eslint express express-generator firebase-tools gatsby-cli - gulp gzip-size-cli json-server netlify-cli - next + new-component nodemon npm-check-updates npm-name-cli @@ -47,7 +48,6 @@ packages=( prettier release-it rollup - standard stylelint superstatic svgo diff --git a/ssh/.ssh/config b/ssh/.ssh/config index c155e2e..2cb381a 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -29,13 +29,14 @@ Host * AddKeysToAgent yes UseKeychain yes PreferredAuthentications publickey - IdentityFile ~/.ssh/id_ed25519 - IdentityFile ~/.ssh/id_rsa + #IdentityFile ~/.ssh/id_ed25519 + #IdentityFile ~/.ssh/id_rsa + IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" Host tufts HostName linux.eecs.tufts.edu User jjarvi01 - IdentityFile ~/.ssh/id_ed25519 + #IdentityFile ~/.ssh/id_ed25519 IdentitiesOnly yes ForwardAgent yes @@ -43,16 +44,16 @@ Host code # tailscale IP: HostName 100.76.96.117 User root - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes ForwardAgent yes Host tor # tailscale IP: HostName 100.68.159.54 User root - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes ForwardAgent yes Host y2k @@ -60,45 +61,45 @@ Host y2k HostName 100.79.167.105 Port 32422 User root - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes ForwardAgent yes Host nas # home net: HostName 192.168.20.11 User jake - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes ForwardAgent yes Host seed # home net: HostName 192.168.20.12 User jake - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes ForwardAgent yes Host argo # home net: HostName 192.168.20.13 User jake - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes ForwardAgent yes Host github.com HostName github.com User git - IdentityFile ~/.ssh/id_ed25519 - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_ed25519 + #IdentitiesOnly yes Host hashbang HostName de1.hashbang.sh User jakej - IdentityFile ~/.ssh/id_rsa - IdentitiesOnly yes + #IdentityFile ~/.ssh/id_rsa + #IdentitiesOnly yes Host *.ssh.wpengine.net IdentityFile ~/.ssh/wpe_devkit diff --git a/vscode/install_extensions.sh b/vscode/install_extensions.sh index f8eae00..7a9099d 100755 --- a/vscode/install_extensions.sh +++ b/vscode/install_extensions.sh @@ -4,13 +4,10 @@ set -euo pipefail extensions=( amazonwebservices.aws-toolkit-vscode - bungcip.better-toml DavidAnson.vscode-markdownlint dbaeumer.vscode-eslint EditorConfig.EditorConfig - eg2.vscode-npm-script esbenp.prettier-vscode - firefox-devtools.vscode-firefox-debug GitHub.github-vscode-theme GitHub.vscode-pull-request-github golang.go @@ -20,11 +17,9 @@ extensions=( ms-vscode-remote.remote-ssh ms-vscode-remote.remote-ssh-edit ms-vscode-remote.vscode-remote-extensionpack - ms-vscode.azure-account ms-vscode.wordcount ms-vsliveshare.vsliveshare ms-vsonline.vsonline - msjsdiag.debugger-for-chrome PKief.material-icon-theme stylelint.vscode-stylelint ) diff --git a/zsh/.zshrc b/zsh/.zshrc index e5f19f7..68609d9 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -72,6 +72,10 @@ export AZURE_CORE_COLLECT_TELEMETRY=0 # TEMPORARY: fixes some breakage with node 17 #export NODE_OPTIONS=--openssl-legacy-provider +# 1Password SSH integration +# https://developer.1password.com/docs/ssh/get-started/#step-4-configure-your-ssh-or-git-client +export SSH_AUTH_SOCK=~/Library/Group\ Containers/2BUA8C4S2C.com.1password/t/agent.sock + # iTerm2 test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"