From 72a23f05829c42ede4a8263db658a021502d67a8 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Wed, 1 Nov 2023 17:12:09 -0400 Subject: [PATCH 1/3] dont crash if win term is not installed --- install-windows.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install-windows.sh b/install-windows.sh index 3dcff82..6e47674 100644 --- a/install-windows.sh +++ b/install-windows.sh @@ -28,6 +28,7 @@ mkdir -p ~/.ssh # Configure the shell ln -sf $EWCONFIG_ROOT/configs/shells/zsh/.zshrc ~/.zshrc ln -sf $EWCONFIG_ROOT/configs/shells/bash/.bashrc ~/.bashrc +mkdir -p $LOCALAPPDATA/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState ln -sf $EWCONFIG_ROOT/configs/windows-terminal/settings.json $LOCALAPPDATA/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json # Configure Git From 41963c2593e6d9fe799c6fba14647fe131c02cd6 Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Wed, 1 Nov 2023 17:15:26 -0400 Subject: [PATCH 2/3] Remove fake python from win10 machines --- install-windows.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/install-windows.sh b/install-windows.sh index 6e47674..a1b0c13 100644 --- a/install-windows.sh +++ b/install-windows.sh @@ -36,6 +36,10 @@ ln -sf $EWCONFIG_ROOT/configs/git/.gitconfig ~/.gitconfig ln -sf $EWCONFIG_ROOT/configs/sssh/allowed_signers ~/.ssh/allowed_signers || true ln -sf $EWCONFIG_ROOT/configs/git/.mailmap ~/.config/git/.mailmap +# Remove Microsoft's fake python executables +rm $LOCALAPPDATA/Microsoft/WindowsApps/python.exe || true +rm $LOCALAPPDATA/Microsoft/WindowsApps/python3.exe || true + # Copy the global mailmap file once if [ ! -f ~/.config/git/config-fragments/global-mailmap.gitconfig ]; then cp $EWCONFIG_ROOT/configs/git/config-fragments/global-mailmap.gitconfig ~/.config/git/config-fragments/global-mailmap.gitconfig From f5d735b7a9d1b9c78198acf1d56d98da55981d3d Mon Sep 17 00:00:00 2001 From: Evan Pratten Date: Wed, 1 Nov 2023 17:46:25 -0400 Subject: [PATCH 3/3] Allow falling back to an rsa key --- configs/ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/ssh/config b/configs/ssh/config index 99754c1..ab276b1 100644 --- a/configs/ssh/config +++ b/configs/ssh/config @@ -3,7 +3,7 @@ Host * !*.github.com !github.com IdentityFile %d/.ssh/id_ed25519_sk_rk_yk20572395 IdentityFile %d/.ssh/id_ed25519 - # IdentityFile %d/.ssh/id_rsa + IdentityFile %d/.ssh/id_rsa VisualHostKey yes # Github SSH adapter for restricted networks