diff --git a/npm/install_globals.sh b/npm/install_globals.sh index 8aa8000..7ce76f6 100755 --- a/npm/install_globals.sh +++ b/npm/install_globals.sh @@ -57,7 +57,7 @@ packages=( ) for p in "${packages[@]}"; do - volta run --no-yarn npm install --global "$p" || echo "$p not found" + volta run --no-yarn -- npm install --global "$p" || echo "$p not found" done volta list all diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 4a8b58c..c155e2e 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -40,12 +40,54 @@ Host tufts ForwardAgent yes Host code - HostName code.jarv.is + # tailscale IP: + HostName 100.76.96.117 User root 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 + ForwardAgent yes + +Host y2k + # tailscale IP: + HostName 100.79.167.105 + Port 32422 + User root + 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 + ForwardAgent yes + +Host seed + # home net: + HostName 192.168.20.12 + User jake + 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 + ForwardAgent yes + Host github.com HostName github.com User git diff --git a/zsh/.zshrc b/zsh/.zshrc index d31f6b3..ad3db0a 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -30,7 +30,6 @@ plugins=( vscode gitignore gnu-utils - zsh_reload zsh-syntax-highlighting zsh-autosuggestions ) diff --git a/zsh/macos.zsh b/zsh/macos.zsh index af820ab..568430c 100644 --- a/zsh/macos.zsh +++ b/zsh/macos.zsh @@ -46,10 +46,10 @@ update() { echo -e "${YELLOW}Updating NPM/Yarn packages...${NC}" volta install node@latest - volta install npm@6 # having issues with npm@7 and volta + volta install npm@6 volta install yarn@1 - volta run --no-yarn --node latest --npm 6 npm update --global - volta run --node latest --yarn 1 yarn global upgrade + volta run --node latest --npm 6 --no-yarn -- npm update --global + volta run --node latest --yarn 1 -- yarn global upgrade echo -e "${YELLOW}Updating Ruby gems...${NC}" gem update --system diff --git a/zsh/plugins/zsh-syntax-highlighting b/zsh/plugins/zsh-syntax-highlighting index 6e0e950..1a9264b 160000 --- a/zsh/plugins/zsh-syntax-highlighting +++ b/zsh/plugins/zsh-syntax-highlighting @@ -1 +1 @@ -Subproject commit 6e0e950154a4c6983d9e077ed052298ad9126144 +Subproject commit 1a9264bc661b3d52756916bf9ec3f41687d64db2