mirror of
https://gitea.blesmrt.net/mikaela/shell-things.git
synced 2025-01-24 19:24:19 +01:00
Compare commits
No commits in common. "87169fc0a82cbbbac085e546daa74215f0b797c4" and "6bbebbabb96368baca917a624199b2aa9f5e0f73" have entirely different histories.
87169fc0a8
...
6bbebbabb9
@ -12,9 +12,11 @@
|
|||||||
cleandix = clean -dix
|
cleandix = clean -dix
|
||||||
# From http://progit.org/book/ch2-7.html
|
# From http://progit.org/book/ch2-7.html
|
||||||
last = cat-file commit HEAD
|
last = cat-file commit HEAD
|
||||||
|
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
|
||||||
mergen = merge --no-ff
|
mergen = merge --no-ff
|
||||||
pulln = pull --no-ff
|
pulln = pull --no-ff
|
||||||
pullen = pull --no-ff
|
pullen = pull --no-ff
|
||||||
|
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
|
||||||
verify = verify-commit HEAD
|
verify = verify-commit HEAD
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
|
@ -12,9 +12,11 @@
|
|||||||
cleandix = clean -dix
|
cleandix = clean -dix
|
||||||
# From http://progit.org/book/ch2-7.html
|
# From http://progit.org/book/ch2-7.html
|
||||||
last = cat-file commit HEAD
|
last = cat-file commit HEAD
|
||||||
|
# From https://github.com/blog/985-git-io-github-url-shortener#comment-15121
|
||||||
mergen = merge --no-ff
|
mergen = merge --no-ff
|
||||||
pulln = pull --no-ff
|
pulln = pull --no-ff
|
||||||
pullen = pull --no-ff
|
pullen = pull --no-ff
|
||||||
|
shorten = "!sh -c 'curl -i http://git.io -F url=$1' -"
|
||||||
verify = verify-commit HEAD
|
verify = verify-commit HEAD
|
||||||
|
|
||||||
[core]
|
[core]
|
||||||
|
@ -475,7 +475,7 @@ exec --no-startup-id sleep 25 && flatpak run org.briarproject.Briar
|
|||||||
# Moment is another non-Electron Matrix client (however this time Qt)
|
# Moment is another non-Electron Matrix client (however this time Qt)
|
||||||
#exec --no-startup-id sleep 10 && flatpak run xyz.mx_moment.moment --start-in-tray
|
#exec --no-startup-id sleep 10 && flatpak run xyz.mx_moment.moment --start-in-tray
|
||||||
# Nheko is may be the most Matrix specification compliant Matrix client
|
# Nheko is may be the most Matrix specification compliant Matrix client
|
||||||
exec --no-startup-id sleep 10 && flatpak run io.github.NhekoReborn.Nheko --profile default
|
exec --no-startup-id sleep 10 && flatpak run io.github.NhekoReborn.Nheko
|
||||||
|
|
||||||
## Redshift for better night display
|
## Redshift for better night display
|
||||||
# Centre of Lauttasaari
|
# Centre of Lauttasaari
|
||||||
|
@ -17,9 +17,9 @@ SocksPort 9052 PreferIPv6 IsolateSOCKSAuth
|
|||||||
SocksPort 9060 OnionTrafficOnly IsolateSOCKSAuth
|
SocksPort 9060 OnionTrafficOnly IsolateSOCKSAuth
|
||||||
|
|
||||||
# HTTP Proxy port
|
# HTTP Proxy port
|
||||||
# This works only for HTTPS and similar
|
# This works only for HTTPS and similar, so I ended up using Privoxy to get
|
||||||
HTTPTunnelPort 8118 IsolateDestAddr PreferIPv6 IsolateSOCKSAuth
|
# apt-listchanges and apt-listbugs also through Tor.
|
||||||
# Legacy compliancy with self
|
#HTTPTunnelPort 8118 IsolateDestAddr PreferIPv6 IsolateSOCKSAuth
|
||||||
HTTPTunnelPort 9119 IsolateDestAddr PreferIPv6 IsolateSOCKSAuth
|
HTTPTunnelPort 9119 IsolateDestAddr PreferIPv6 IsolateSOCKSAuth
|
||||||
|
|
||||||
# Uncomment to disable IPv4
|
# Uncomment to disable IPv4
|
||||||
|
Loading…
Reference in New Issue
Block a user