Verified Commit 2fd434dc authored by Dom Sekotill's avatar Dom Sekotill
Browse files

Merge master branches

parents 0bcef9fe d938e177

.oh-my-zsh @ 92da3108

Compare f6cd6a77 to 92da3108
Original line number Diff line number Diff line 
Subproject commit f6cd6a776993b584f4abbdd204c6e4011b7d2f93
 
Subproject commit 92da3108b52be506dc1334e8f0dc67c5d1c13d57

.ssh/config

+7 −2
Original line number Diff line number Diff line
@@ -17,9 +17,14 @@ Match host pump.net.kodo.org.uk 
	Compression yes

	ForwardX11 yes

Match host pump.net.kodo.org.uk exec "sh -c 'test -d /run/user/%i'"

	RemoteForward /run/user/1001/gnupg/S.gpg-agent /run/user/%i/gnupg/S.gpg-agent.extra

	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/%i/gnupg/S.gpg-agent.extra

Match host pump.net.kodo.org.uk exec "sh -c '! test -d /run/user/%i'"

	RemoteForward /run/user/1001/gnupg/S.gpg-agent %d/.gnupg/S.gpg-agent.extra

	RemoteForward /run/user/1000/gnupg/S.gpg-agent %d/.gnupg/S.gpg-agent.extra



Match host gytha.net.kodo.org.uk exec "sh -c 'test -d /run/user/%i'"

	RemoteForward /run/user/1000/gnupg/S.gpg-agent /run/user/%i/gnupg/S.gpg-agent.extra

Match host gytha.net.kodo.org.uk exec "sh -c '! test -d /run/user/%i'"

	RemoteForward /run/user/1000/gnupg/S.gpg-agent %d/.gnupg/S.gpg-agent.extra





# === LAN Settings ===

asyncrun @ 78dc9277

Compare d6ba5dc7 to 78dc9277
Original line number Diff line number Diff line 
Subproject commit d6ba5dc77dfab73ebeeea16e4f6fbd65400e6905
 
Subproject commit 78dc9277f2b989553861ee7c35b640112d95e1b5

editorconfig-vim @ 91bd0b0a

Compare 8b7da79e to 91bd0b0a
Original line number Diff line number Diff line 
Subproject commit 8b7da79e9daee7a3f3a8d4fe29886b9756305aff
 
Subproject commit 91bd0b0a2c6a72a110ab9feae335e1224480c233

vim-commentary @ 64a654ef

Compare c4b8f52c to 64a654ef
Original line number Diff line number Diff line 
Subproject commit c4b8f52cbb7142ec239494e5a2c4a512f92c4d07
 
Subproject commit 64a654ef4a20db1727938338310209b6a63f60c9