.pre-commit-config.yaml: note updating in comment

Ref: #153

.gitattributes

@@ -1,6 +1,11 @@
-* text=auto eol=lf linguist-detectable
+*	text=auto eol=lf linguist-detectable
+
+# These files are scary, let's not touch them
+LICENSE	text lockable
+CITATION.cff	text lockable
+
 # Windows files even in checkout
 # Ref: https://rehansaeed.com/gitattributes-best-practices/#line-endings
-*.{reg,[rR][eE][gG]} text eol=crlf
+*.{reg,[rR][eE][gG]}	text eol=crlf
-*.{bat,[bB][aA][tT]} text eol=crlf
+*.{bat,[bB][aA][tT]}	text eol=crlf
-*.{ahk,[aA][hH][kK]} text eol=crlf
+*.{ahk,[aA][hH][kK]}	text eol=crlf

.mikaela/gitconfig

@@ -1,9 +1,12 @@
 [user]
 	name = Aminda Suomalainen
 	email = suomalainen+git@mikaela.info
+	# Email stored on my FINEID
+	#email = suomalainen@mikaela.info
 	# Aminda Suomalainen FINEID 20.12.2021-20.12.2026
 	signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
 	#signingkey = ~/.ssh/id_ed25519.pub
+	#signingkey = 0x414E406A
 	##wtop
 	#email = mikaela+digitalents@mikaela.info
 	#signingkey = 0xDF046339D69EB8C9
@@ -54,14 +57,17 @@
 #	 diffFilter = diff-highlight
 [gpg]
 	format = ssh
+	#format = x509
+[gpg "ssh"]
+	allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
+#[gpg "x509"]
+#	program = gpgsm
 [tag]
 	forceSignAnnotated = true
 [pull]
 	ff = only
 [init]
 	defaultBranch = cxefa
-[gpg "ssh"]
-	allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
 [advice]
 	# I am not developing in detached head state, I generally want to compile
 	# a specific version of a program and I know how to get out of it

.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+# Remember to run `pre-commit install` at least once!
+# Manual test run: `pre-commit run --all-files`
+# Update? `pre-commit autoupdate`
+#
+# See https://pre-commit.com for more information
+# See https://pre-commit.com/hooks.html for more hooks
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.4.0
+    hooks:
+    -   id: check-case-conflict
+    -   id: check-executables-have-shebangs
+    -   id: check-shebang-scripts-are-executable
+    -   id: destroyed-symlinks
+    -   id: detect-private-key
+    -   id: fix-byte-order-marker

CITATION.cff

@@ -0,0 +1,17 @@
+# This CITATION.cff file was generated with cffinit.
+# Visit https://citation-file-format.github.io/cff-initializer-javascript/#/ to generate yours today!
+
+cff-version: 1.2.0
+title: shell-things
+message: >-
+  If you use this dataset, please cite it using the metadata
+  from this file.
+type: dataset
+authors:
+  - given-names: Aminda
+    family-names: Suomalainen
+    email: suomalainen+git@mikaela.info
+  - given-names: git shortlog -sne
+repository-code: 'https://gitea.blesmrt.net/Mikaela/shell-things'
+abstract: dotfiles
+license: BSD-3-Clause

LICENSE

@@ -0,0 +1,11 @@
+Copyright (c) <year> <owner>. 
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

LICENSE.md

@@ -1,32 +0,0 @@
-BSD 3-Clause License
-
-Copyright (c) 2012-2019, Mikaela Suomalainen & contributors (git shortlog -sne)
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its
-   contributors may be used to endorse or promote products derived from
-   this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Portions of the included source code are copyright by its original author(s)
-and remain subject to its associated license.

Windows/DoH/DohWellKnownServers.reg

@@ -26,6 +26,30 @@ Windows Registry Editor Version 5.00
 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\1.0.0.2]
 "Template"="https://security.cloudflare-dns.com/dns-query"
 
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\2a0f:fc80::]
+"Template"="https://dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\2a0f:fc81::]
+"Template"="https://dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\193.110.81.0]
+"Template"="https://dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\185.253.5.0]
+"Template"="https://dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\2a0f:fc80::9]
+"Template"="https://zero.dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\2a0f:fc81::9]
+"Template"="https://zero.dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\193.110.81.9]
+"Template"="https://zero.dns0.eu"
+
+[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\185.253.5.9]
+"Template"="https://zero.dns0.eu"
+
 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\193.19.108.2]
 "Template"="https://doh.mullvad.net/dns-query"
 
@@ -79,4 +103,3 @@ Windows Registry Editor Version 5.00
 
 [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\Dnscache\Parameters\DohWellKnownServers\2001:67c:2b0::2]
 "Template"="https://dns.quad9.net/dns-query"
-

Windows/DoH/README.md

@@ -10,6 +10,7 @@ Requires Windows 11.
   that Windows 11 isn't shipping by default, currently:
   * Adguard
   * Cloudflare antimalware
+  * DNS0 (& Zero)
   * Mullvad
   * Mullvad Adblock
   * Quad9 ECS (Windows 11 defaults include Quad9 default)

conf/gitconfig

@@ -1,9 +1,12 @@
 [user]
 	#name = Aminda Suomalainen
 	#email = suomalainen+git@mikaela.info
+	# Email stored on my FINEID
+	#email = suomalainen@mikaela.info
 	# Aminda Suomalainen FINEID 20.12.2021-20.12.2026
 	#signingkey = ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCuq/w936y0Enjg7e+t27p6Hwj7RJpuDdhjV/FeikCitey23dx72yIFe3giHW10eBKHr0lhWbDhm2m0b74ZNKneR+oJ99Kl98KegGwjS/gRcjYILHWBJBCF7y61XNeJTlehEZ4zAXS3zLGaZ6DUWY3aqoMkoiAFDdHEAu5EfYITybR+eQZNiGOLVpEVC96bSgGYl4BtUjLib8YCkznllo1hbQWOJSeftIkCJj/XcOvX5kIHsnTMdkgPVd+JhBJ1ReYLf4mBYA0BVTBbHJVrMajz77Oo4iZua3XDw3RF9cekAHjh+x/zZntwiRu0k51xI0mX5nr9SsuiQccD/fxwCoI9P1u2xZHFthiHl4MxUvTRDuBTz8bktdUruqxJP+ZkKZmuozLhP738m+9nMRiavSJm0RQGDUMXfHoJ8+9VVB4uZRZq9Hprt7ReCYobgRaq4220Cpg/WADcm13o0jp0PKOl2uiS6MdIbReiLGJVf/XxeNun43K1+osv/Ermy6qL5WM=
 	#signingkey = ~/.ssh/id_ed25519.pub
+	#signingkey = 0x414E406A
 	##wtop
 	#email = mikaela+digitalents@mikaela.info
 	#signingkey = 0xDF046339D69EB8C9
@@ -54,14 +57,17 @@
 #	 diffFilter = diff-highlight
 [gpg]
 	format = ssh
+	#format = x509
+[gpg "ssh"]
+	allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
+#[gpg "x509"]
+#	program = gpgsm
 [tag]
 	forceSignAnnotated = true
 [pull]
 	ff = only
 [init]
 	defaultBranch = cxefa
-[gpg "ssh"]
-	allowedSignersFile = ~/src/gitea.blesmrt.net/Mikaela/ssh-allowed_signers/allowed_signers
 [advice]
 	# I am not developing in detached head state, I generally want to compile
 	# a specific version of a program and I know how to get out of it

etc/resolv.tsv

@@ -15,6 +15,7 @@ Cloudflare MozillaFirefox	https://mozilla.cloudflare-dns.com/dns-query
 CZ.NIC ODVR	https://odvr.nic.cz/dns-query	odvr.nic.cz	2001:148f:ffff::1	2001:148f:fffe::1	193.17.47.1	185.43.135.1	
 DNS0	https://dns0.eu	dns0.eu	2a0f:fc80::	2a0f:fc81::	193.110.81.0	185.253.5.0	https://www.dns0.eu/dns0.eu.mobileconfig
 DNS0 Kids	https://kids.dns0.eu	kids.dns0.eu	2a0f:fc80::1	2a0f:fc81::1	193.110.81.1	185.253.5.1	https://www.dns0.eu/kids.dns0.eu.mobileconfig
+DNS0 Open (unfiltered, discouraged)	https://open.dns0.eu	open.dns0.eu	2a0f:fc80::ffff	2a0f:fc81::ffff	193.110.81.254	185.253.5.254	https://dns0.eu/open.dns0.eu.mobileconfig
 DNS0 Zero	https://zero.dns0.eu	zero.dns0.eu	2a0f:fc80::9	2a0f:fc81::9	193.110.81.9	185.253.5.9	https://www.dns0.eu/zero.dns0.eu.mobileconfig
 Mullvad	https://doh.mullvad.net/dns-query	doh.mullvad.net	2a07:e340::2		194.242.2.2	193.19.108.2	
 Mullvad Adblock	https://adblock.doh.mullvad.net/dns-query	adblock.doh.mullvad.net	2a07:e340::3		194.242.2.3	193.19.108.3	

etc/ssh/ssh_config

@@ -31,7 +31,7 @@ Host *
 	Protocol 2
 
 	# Tor through openbsd netcat (Fedora: netcat)
-	ProxyCommand netcat -X 5 -x localhost:9050 %h %p
+	#ProxyCommand netcat -X 5 -x localhost:9050 %h %p
 
 	# Always try public key authentication.
 	PubkeyAuthentication yes

gpg/gnupg-pkcs11-scd.conf

@@ -0,0 +1,3 @@
+# FINEID https://gist.github.com/pyllyukko/a1ed6baa6b638b805a30b16960399e94
+providers p1
+provider-p1-library /usr/lib64/libcryptoki.so

gpg/gpg-agent.conf

@@ -10,3 +10,7 @@ no-grab
 # want to type my password so often just to see encrypted facebook emails.
 default-cache-ttl 7200
 default-cache-ttl-ssh 7200
+
+# FINEID, Fedora: gnupg-pkcs11-scd
+# https://gist.github.com/pyllyukko/a1ed6baa6b638b805a30b16960399e94
+scdaemon-program /usr/bin/gnupg-pkcs11-scd