Merge branch 'master' of https://github.com/Ewpratten/ewconfig
This commit is contained in:
commit
f3c433304c
@ -3,7 +3,7 @@
|
|||||||
Host * !*.github.com !github.com
|
Host * !*.github.com !github.com
|
||||||
IdentityFile %d/.ssh/id_ed25519_sk_rk_yk20572395
|
IdentityFile %d/.ssh/id_ed25519_sk_rk_yk20572395
|
||||||
IdentityFile %d/.ssh/id_ed25519
|
IdentityFile %d/.ssh/id_ed25519
|
||||||
# IdentityFile %d/.ssh/id_rsa
|
IdentityFile %d/.ssh/id_rsa
|
||||||
VisualHostKey yes
|
VisualHostKey yes
|
||||||
|
|
||||||
# Github SSH adapter for restricted networks
|
# Github SSH adapter for restricted networks
|
||||||
|
@ -28,6 +28,7 @@ mkdir -p ~/.ssh
|
|||||||
# Configure the shell
|
# Configure the shell
|
||||||
ln -sf $EWCONFIG_ROOT/configs/shells/zsh/.zshrc ~/.zshrc
|
ln -sf $EWCONFIG_ROOT/configs/shells/zsh/.zshrc ~/.zshrc
|
||||||
ln -sf $EWCONFIG_ROOT/configs/shells/bash/.bashrc ~/.bashrc
|
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
|
ln -sf $EWCONFIG_ROOT/configs/windows-terminal/settings.json $LOCALAPPDATA/Packages/Microsoft.WindowsTerminal_8wekyb3d8bbwe/LocalState/settings.json
|
||||||
|
|
||||||
# Configure Git
|
# Configure Git
|
||||||
@ -35,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/sssh/allowed_signers ~/.ssh/allowed_signers || true
|
||||||
ln -sf $EWCONFIG_ROOT/configs/git/.mailmap ~/.config/git/.mailmap
|
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
|
# Copy the global mailmap file once
|
||||||
if [ ! -f ~/.config/git/config-fragments/global-mailmap.gitconfig ]; then
|
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
|
cp $EWCONFIG_ROOT/configs/git/config-fragments/global-mailmap.gitconfig ~/.config/git/config-fragments/global-mailmap.gitconfig
|
||||||
|
Loading…
x
Reference in New Issue
Block a user