Resolve stash conflicts in ssh config and zshrc
This commit is contained in:
22
.ssh/config
22
.ssh/config
@@ -42,6 +42,10 @@ Host cobalt
|
|||||||
HostName 10.85.3.6
|
HostName 10.85.3.6
|
||||||
User root
|
User root
|
||||||
|
|
||||||
|
Host ssh.kitsunehosting.net
|
||||||
|
port 2222
|
||||||
|
IdentityFile ~/.ssh/gitea
|
||||||
|
|
||||||
# Supermicro machine in the server rack
|
# Supermicro machine in the server rack
|
||||||
Host manganese
|
Host manganese
|
||||||
HostName 10.85.3.5
|
HostName 10.85.3.5
|
||||||
@@ -52,11 +56,6 @@ Host nickel
|
|||||||
HostName 10.85.3.4
|
HostName 10.85.3.4
|
||||||
User root
|
User root
|
||||||
|
|
||||||
# The small romi robot for 1721
|
|
||||||
Host romi
|
|
||||||
HostName 10.17.21.55
|
|
||||||
User joe
|
|
||||||
|
|
||||||
# My main NAS
|
# My main NAS
|
||||||
Host zinc
|
Host zinc
|
||||||
IdentityFile ~/.ssh/hydroxonium
|
IdentityFile ~/.ssh/hydroxonium
|
||||||
@@ -160,8 +159,13 @@ Host retropie
|
|||||||
# The little docker host in the closet
|
# The little docker host in the closet
|
||||||
# Runs the vestabot image
|
# Runs the vestabot image
|
||||||
Host stdocker1
|
Host stdocker1
|
||||||
HostName 10.20.30.225
|
HostName 10.10.20.27
|
||||||
IdentityFile ~/.ssh/stdocker
|
IdentityFile ~/.ssh/silvertech-iot
|
||||||
|
|
||||||
|
# Platformio remote
|
||||||
|
Host pio-remote
|
||||||
|
HostName 10.144.0.15
|
||||||
|
IdentityFile ~/.ssh/silvertech-iot
|
||||||
|
|
||||||
# Little mini-pc in the IOT room
|
# Little mini-pc in the IOT room
|
||||||
Host pioremote
|
Host pioremote
|
||||||
@@ -177,7 +181,9 @@ Host workLaptop
|
|||||||
|
|
||||||
# Argen pi
|
# Argen pi
|
||||||
Host argen
|
Host argen
|
||||||
HostName 10.20.30.224
|
HostName 10.10.20.11
|
||||||
|
User joe
|
||||||
|
IdentityFile ~/.ssh/gitlab
|
||||||
|
|
||||||
Host asterisk
|
Host asterisk
|
||||||
HostName 10.85.3.155
|
HostName 10.85.3.155
|
||||||
|
|||||||
4
.zshrc
4
.zshrc
@@ -3,9 +3,13 @@ uwufetch
|
|||||||
echo ""
|
echo ""
|
||||||
fortune -a
|
fortune -a
|
||||||
|
|
||||||
|
# This is for platformio on work machine
|
||||||
|
path+=("$HOME/.platformio/penv/bin")
|
||||||
|
|
||||||
# Add my bins to path
|
# Add my bins to path
|
||||||
path+=("$HOME/.local/bin")
|
path+=("$HOME/.local/bin")
|
||||||
path+=("$HOME/Pictures/Furry/Scripts")
|
path+=("$HOME/Pictures/Furry/Scripts")
|
||||||
|
path+=("/opt/balena-cli/")
|
||||||
export PATH
|
export PATH
|
||||||
|
|
||||||
# LaTeX Import path
|
# LaTeX Import path
|
||||||
|
|||||||
Reference in New Issue
Block a user