Resolve stash conflicts in ssh config and zshrc

This commit is contained in:
KenwoodFox
2026-06-02 13:55:28 -04:00
parent f3be14b0ed
commit fc11a2202d
2 changed files with 18 additions and 8 deletions

View File

@@ -42,6 +42,10 @@ Host cobalt
HostName 10.85.3.6
User root
Host ssh.kitsunehosting.net
port 2222
IdentityFile ~/.ssh/gitea
# Supermicro machine in the server rack
Host manganese
HostName 10.85.3.5
@@ -52,11 +56,6 @@ Host nickel
HostName 10.85.3.4
User root
# The small romi robot for 1721
Host romi
HostName 10.17.21.55
User joe
# My main NAS
Host zinc
IdentityFile ~/.ssh/hydroxonium
@@ -160,8 +159,13 @@ Host retropie
# The little docker host in the closet
# Runs the vestabot image
Host stdocker1
HostName 10.20.30.225
IdentityFile ~/.ssh/stdocker
HostName 10.10.20.27
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
Host pioremote
@@ -177,7 +181,9 @@ Host workLaptop
# Argen pi
Host argen
HostName 10.20.30.224
HostName 10.10.20.11
User joe
IdentityFile ~/.ssh/gitlab
Host asterisk
HostName 10.85.3.155

4
.zshrc
View File

@@ -3,9 +3,13 @@ uwufetch
echo ""
fortune -a
# This is for platformio on work machine
path+=("$HOME/.platformio/penv/bin")
# Add my bins to path
path+=("$HOME/.local/bin")
path+=("$HOME/Pictures/Furry/Scripts")
path+=("/opt/balena-cli/")
export PATH
# LaTeX Import path