[ssh] fix bad merge
This commit is contained in:
@ -8,3 +8,5 @@ Xcursor*theme: Qogir
|
|||||||
Sxiv.font: "Go Mono":size=10
|
Sxiv.font: "Go Mono":size=10
|
||||||
Sxiv.foreground: #000000
|
Sxiv.foreground: #000000
|
||||||
Sxiv.background: #393939
|
Sxiv.background: #393939
|
||||||
|
|
||||||
|
Xft.dpi: 160
|
||||||
|
|||||||
@ -50,6 +50,8 @@ Host daphnis.local
|
|||||||
User powellc
|
User powellc
|
||||||
Host hyperion.local
|
Host hyperion.local
|
||||||
User powellc
|
User powellc
|
||||||
|
Host loge.local
|
||||||
|
User powellc
|
||||||
Host dione.local
|
Host dione.local
|
||||||
User powellc
|
User powellc
|
||||||
Host rhea.local
|
Host rhea.local
|
||||||
@ -94,7 +96,7 @@ Host *.local 192.168.1.*
|
|||||||
User root
|
User root
|
||||||
IdentityFile ~/.ssh/jails
|
IdentityFile ~/.ssh/jails
|
||||||
Hostname %h
|
Hostname %h
|
||||||
#ProxyJump bastion.unbl.ink
|
ProxyJump bastion.unbl.ink
|
||||||
|
|
||||||
Host *.cloud51
|
Host *.cloud51
|
||||||
HostName %h
|
HostName %h
|
||||||
|
|||||||
@ -24,11 +24,7 @@ application/x-extension-shtml=firefox.desktop
|
|||||||
application/xhtml+xml=org.qutebrowser.qutebrowser.desktop
|
application/xhtml+xml=org.qutebrowser.qutebrowser.desktop
|
||||||
application/x-extension-xhtml=firefox.desktop
|
application/x-extension-xhtml=firefox.desktop
|
||||||
application/x-extension-xht=firefox.desktop
|
application/x-extension-xht=firefox.desktop
|
||||||
x-scheme-handler/postman=Postman.desktop
|
|
||||||
x-scheme-handler/msteams=teams.desktop
|
|
||||||
x-scheme-handler/tootle=com.github.bleakgrey.tootle.desktop
|
x-scheme-handler/tootle=com.github.bleakgrey.tootle.desktop
|
||||||
x-scheme-handler/webcal=google-chrome.desktop
|
|
||||||
x-scheme-handler/mailto=thunderbird.desktop
|
|
||||||
|
|
||||||
[Added Associations]
|
[Added Associations]
|
||||||
application/pem-certificate-chain=gvim.desktop;
|
application/pem-certificate-chain=gvim.desktop;
|
||||||
|
|||||||
Reference in New Issue
Block a user