Sundry editing.

001_apt-sources.sh

@@ -4,6 +4,8 @@ set -x
 rm /etc/apt/sources.list
 rm /etc/apt/sources.list.d/devuan.list
 
+sudo apt install -y apt-transport-tor apt-transport-https
+
 # https://www.devuan.org/os/packages
 # FIXME: the mirror is now permenently on deb but:
 # http://deb.devuan.org/merged
@@ -11,6 +13,7 @@ rm /etc/apt/sources.list.d/devuan.list
 # http://deb.devuan.org/devuan
 # is used for experimental, proposed-updates
 
+TRANSPORT="https"
 #MIRROR=deb
 #MIRROR=pkgmaster
 MIRROR=deb
@@ -18,7 +21,6 @@ ACTIVE=/etc/apt/sources.list.d
 AVAILABLE=/etc/apt/sources.list-available
 mkdir -p "${AVAILABLE}"
 
-
 SECTION=(main contrib non-free non-free-firmware)
 # ACTIVE_LIST=('freia')
 # ACTIVE_LIST=('freia' 'freia-security' 'freia-updates' 'freia-backports')
@@ -37,37 +39,50 @@ OTHER_LIST=('experimental')
 echo ${#ACTIVE_LIST[@]}
 for RELEASE in "${ACTIVE_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<-EOF
-deb http://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+		deb ${TRANSPORT}://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
-deb-src http://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+		deb-src ${TRANSPORT}://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
-EOF
+	EOF
-ln -sf "${AVAILABLE}"/devuan_"${RELEASE}".list "${ACTIVE}"/devuan_"${RELEASE}".list
+	ln -sf "${AVAILABLE}"/devuan_"${RELEASE}".list "${ACTIVE}"/devuan_"${RELEASE}".list
 done
 
 echo ${#INACTIVE_LIST[@]}
 for RELEASE in "${INACTIVE_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<-EOF
-deb http://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+		deb ${TRANSPORT}://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
-deb-src http://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+		deb-src ${TRANSPORT}://${MIRROR}.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
-EOF
+	EOF
 done
 
 echo ${#OTHER_LIST[@]}
 for RELEASE in "${OTHER_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<-EOF
-deb http://${MIRROR}.devuan.org/devuan ${RELEASE} main
+		deb ${TRANSPORT}://${MIRROR}.devuan.org/devuan ${RELEASE} main
-deb-src http://${MIRROR}.devuan.org/devuan ${RELEASE} main
+		deb-src ${TRANSPORT}://${MIRROR}.devuan.org/devuan ${RELEASE} main
-EOF
+	EOF
 done
 
+# ONION="devuanauxrkggcowgm2vcs6go3c5pgxdidd5wqjpg7zpfaxkmgspr6id.onion"
+# TRANSPORT="tor+http"
+#
+# for RELEASE in "${OTHER_LIST[@]}"; do
+# 	echo "${RELEASE}"
+# 	bash -c "cat > ${AVAILABLE}/devuan-onion_${RELEASE}.list" <<-EOF
+# 		deb ${TRANSPORT}://${ONION}/merged ${RELEASE} ${SECTION[@]}
+# 		deb ${TRANSPORT}://${ONION}/merged ${RELEASE}-updates ${SECTION[@]}
+# 		deb ${TRANSPORT}://${ONION}/merged ${RELEASE}-security ${SECTION[@]}
+# 	EOF
+# done
+
 #bash -c "cat > ${AVAILABLE}/saltstack.list" <<EOF
 #
 #deb http://debian.saltstack.com/debian stretch-saltstack main
 #EOF
 #ln -sf "${AVAILABLE}"/saltstack.list "${ACTIVE}"/saltstack.list
 #
+#
 ## the docker packages have go over to systemd so these wont install
 #bash -c cat > "${AVAILABLE}"/docker.list <<EOF
 #

020_brave_browser.sh

@@ -6,20 +6,24 @@ machine=$(uname -m)
 if [[ ${machine} == x86_64 ]]; then
 	arch=amd64
 elif
-	[[ ${machine} == aarch64 ]]; then
+	[[ ${machine} == aarch64 ]]
+then
 	arch=arm64
 fi
 
 UBUNTU_CODENAME=bionic
 URL="brave-browser-apt-release.s3.brave.com"
-
+KEY_URL="brave-browser-apt-release.s3.brave.com"
+KEY_DIR=/etc/apt/trusted.gpg.d
+KEY_NAME=brave-browser-archive-keyring.gpg
+KEY=${KEY_DIR}/${KEY_NAME}
 #curl -s https://${URL}/brave-core.asc | apt-key --keyring /etc/apt/trusted.gpg.d/brave-browser-release.gpg add -
 
 #sudo curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave4u7jddbv7cyviptqjc7jusxh72uik7zt6adtckl5f4nwy2v72qd.onion/brave-browser-archive-keyring.gpg
 
-sudo curl -fsSLo /usr/share/keyrings/brave-browser-archive-keyring.gpg https://brave-browser-apt-release.s3.brave.com/brave-browser-archive-keyring.gpg
+sudo curl -fsSLo ${KEY_DIR}/${KEY_NAME} https://${KEY_URL}/${KEY_NAME}
 
-sudo echo "deb [signed-by=/usr/share/keyrings/brave-browser-archive-keyring.gpg arch=${arch}] https://${URL} ${UBUNTU_CODENAME} main" | tee /etc/apt/sources.list-available/brave-browser.list
+sudo echo "deb [signed-by=${KEY} arch=${arch}] https://${URL} ${UBUNTU_CODENAME} main" | tee /etc/apt/sources.list-available/brave-browser.list
 
 ln -sf /etc/apt/sources.list-available/brave-browser.list /etc/apt/sources.list.d/brave-browser.list
 
@@ -27,7 +31,7 @@ apt update
 
 apt install -y brave-browser brave-keyring
 
-echo 'kernel.unprivileged_userns_clone=1' > /etc/sysctl.d/00-local-userns.conf
+echo 'kernel.unprivileged_userns_clone=1' >/etc/sysctl.d/00-local-userns.conf
 #service procps restart
 
 # Bypass apt-proxy for brave packages
@@ -38,9 +42,9 @@ if [ -f /etc/apt/apt.conf.d/02proxy ]; then
 	cat /etc/apt/apt.conf.d/02proxy
 	if [ ! -z $(grep ${URL} /etc/apt/apt.conf.d/02proxy) ]; then
 		echo "first"
-		echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
+		echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >>/etc/apt/apt.conf.d/02proxy
 	fi
 else
 	echo "second"
-	echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >> /etc/apt/apt.conf.d/02proxy
+	echo "Acquire::http::Proxy { \"${URL}\" DIRECT; };" >>/etc/apt/apt.conf.d/02proxy
 fi

020_devuan-devel.sh

@@ -0,0 +1,13 @@
+DEST=${1:-/etc/skel}
+
+# allow rmadison -u devuan
+conf_print_devscripts() {
+	cat <<-EOF
+		RMADISON_URL_MAP_DEVUAN=https://api.pkginfo.devuan.org/madison
+	EOF
+}
+conf_print_devscripts | tee ${DEST}/.devscripts
+
+# add autopkgtest to pbuildrc
+
+sudo ln -sf /usr/share/doc/pbuilder/examples/B20autopkgtest /srv/pbuilder/hook.d/B20autopkgtest

020_gitea_dpr.sh

@@ -2,7 +2,7 @@
 
 # Add a sources.list that points to the gitea instance.
 # https://docs.gitea.com/usage/packages/debian
-sudo apt-get install -y tea-cli
+# sudo apt-get install -y tea-cli
 
 GITEA_URL="git2.ring-zero.co.uk"
 OWNER="cyteen"
@@ -29,6 +29,38 @@ EOF
 # fetch the gitea signed-by key
 curl -fsSL https://${GITEA_URL}/api/packages/${OWNER}/debian/repository.key | gpg --dearmor -q | sudo tee ${KEYRING} >/dev/null
 
+# cat <<-EOF | sudo gpg --dearmor -o ${KEYRING}
+# 	-----BEGIN PGP ARMORED FILE-----
+# 	Comment: Use "gpg --dearmor" for unpacking
+#
+# 	xsBNBGYk0YoBCACqBlpqZ8oNJFsTgfLEzuIUdKRKDGeK2MD05/KF5PrDBMxeJEJP
+# 	wGk5q0V/ol/bQ8PxWJgpn+UitZ5Np33ksOZG0EeEb2Ejiw1idpDEEFR6jzCUj5xV
+# 	Mmlg825r4iwnrM4XK80fGv2MdSa0pV7NXyrL7Jk5ReufdjX9LRtFV9nvtYRHm6sP
+# 	QPTm0jLsi1+cKGnVlEYCeYHKMYZP6ohlyCYry7E5aiNgLIWJT3GwB+wvsGd0sxuK
+# 	5nBNCYdvDmeBE1GHzyqhytcl1n8DgsMnwBzh3uEHv5Vtx44NDgDJ02dfwJ1WbPqb
+# 	W58vcgEyW8f1Y1GaaIQ6ecwLlqkuKwmV5uy/ABEBAAHNEShEZWJpYW4gUmVnaXN0
+# 	cnkpwsBiBBMBCAAWBQJmJNGKCRDVLqQI2UdsaQIbAwIZAQAAmCoIACwGuYnw5bgM
+# 	N7/u0PVoKHdI1lskX0UjVWMDup/QAk9NOYGrq2GXNKPnmI8AyeteX+wdpDU+lzvy
+# 	iTUMSTt8aSvWuKWYWJOkyrWJumwuXSNE3eMpqLL0yKHs5xif4CA5Qu2I12+JAH8C
+# 	caqRALPr1//qjFwzwk7MGXTWyyEh9pC8ZxNapF8fvFZfFwbXUvFtxh9M3V8bJJU2
+# 	l3kpTYCY3wPnEBoJWSFhwciBY3T7/aMLcJXycjcKykblAF6rDC+AQTAgn/MGcqn4
+# 	1mNJFfV1qYuOVFmjmq6zwVf2zKz0TxHnZplsQyx5OqTJ3fEtfRJEA2sCsZ5eaipC
+# 	jku2Hpxp4GLOwE0EZiTRigEIAJcVe4rmeI/kw9hFfYSvCgFAfHuUmuOVG3nFvkNP
+# 	w4epKXAuCxtyDhNOQugrV0iyhC5OGpBMvibeVkVB08IIk+DwI4/9+SDXCKbT1d2g
+# 	QU+XokdUnjG08uSfH+Y6tRPsXw5uK8ULWcg1Mqaimsy9pc+IzZ3OiKCMU8jnUo0T
+# 	oso6NaSIE3KM6g4EbNEfpBK35cZW8rEjsl/tF2PjNNfkAVphrNKCRA64OhqtvI8f
+# 	jc43RWz03JlvKNMVMaB3ef4Q3nzfYzTV+9L3ux6SelYLtcJ+//nXB26b7ugcFsVG
+# 	6bJPYdKVrqXmOPb6zh0Qh0UIp2Ga7HaYXoGqCQU0XH6fm1cAEQEAAcLAXwQYAQgA
+# 	EwUCZiTRigkQ1S6kCNlHbGkCGwwAAIT2CAA+rH7xC34XjFV3rcfgO8w8M1qau3fc
+# 	INdouQ682agGcgJQV56fBoNl1ffLdYqAs43zmr1Bnb8odgTiwgg8tx6luoF+tAMa
+# 	43gPBfG87AuV2OIcubxit0I2tQuhiVRrBtNfhP/qogWZMzWg/0ruRB8KCxzmh6Ru
+# 	crYHRRqetSl+hc3npVGPvX7T8mVcC+BNNiTQScM/1hZEnAlvEZ+aVD+IlaGxEmTn
+# 	zORnycVVrieEG7dpquBjOTJGUOgtmQi4KrF4wd340CnC1u8Qr0PMwCRaybqI11fV
+# 	ZoAVBYYnhJhC/QhCHvs/5REn2DPwePiTTXDvrNIhE/dzmlEu2qnG+6ZP
+# 	=65hZ
+#	 -----END PGP ARMORED FILE-----
+# EOF
+
 # rather than put username:password@ in the url to gitea we use apt_auth
 conf_print_apt_auth() {
 	cat <<-EOF

020_hyprland.sh

@@ -1445,6 +1445,13 @@ DEPENDS="hyprland-protocols, \
 GIT_BUILDER='sbuild --arch-all --source --source-only-changes --verbose --dist=unstable'
 
 #	--extra-package="${EXTRA_PACKAGES}" \
+#	devuan specific https://git.devuan.org/devuan/documentation/src/branch/master/maintainers/PackagingGuide.md:
+#	gbp buildpackage \
+#	--git-pbuilder \
+#	--git-dist=ceres \
+#	create \
+#	--mirror http://pkgmaster.devuan.org/merged
+#
 sudo gbp buildpackage \
 	--add-depends="${DEPENDS}" \
 	--extra-repository="${GITEA_LIST}" \

020_qucs-s.sh

@@ -9,13 +9,15 @@ set -e
 RELEASE_NAME=Debian_11 # bullseye
 
 SUSE_USER="ra3xdh"
-KEY_DIR=/etc/apt/keyrings
+# KEY_DIR=/etc/apt/keyrings
+KEY_DIR=/etc/apt/trusted.gpg.d/
+KEY=${KEY_DIR}/ra3xdh.keyring.gpg
 
 mkdir -p /etc/apt//sources.list-available || exit
 cat <<EOF | sudo tee /etc/apt/sources.list-available/qucs-s.list >/dev/null
-# wget -nv https://download.opensuse.org/repositories/home:/${SUSE_USER}/${RELEASE_NAME}/Release.key -O Release.key
+# wget -nv https://download.opensuse.org/repositories/home:/${SUSE_USER}/${RELEASE_NAME}/Release.key -O ${KEY}
 # apt-key add - < Release.key
-deb http://download.opensuse.org/repositories/home:/${SUSE_USER}/${RELEASE_NAME}/ /
+deb [signed-by=${KEY}] http://download.opensuse.org/repositories/home:/${SUSE_USER}/${RELEASE_NAME}/ /
 EOF
 
 # The dl-bintray repo doesn't play nice with apt-proxy
@@ -23,10 +25,8 @@ EOF
 
 sudo ln -sf /etc/apt/sources.list-available/qucs-s.list /etc/apt/sources.list.d/qucs-s.list
 
-wget -nv https://download.opensuse.org/repositories/home:/${SUSE_USER}/${RELEASE_NAME}/Release.key -O- | sudo tee ${KEY_DIR}/qucs-s.gpg
+wget -nv https://download.opensuse.org/repositories/home:/${SUSE_USER}/${RELEASE_NAME}/Release.key -O- | gpg --dearmor -o ${KEY}
 
 sudo apt update
 
 sudo apt install -y qucs-s
-
-

020_zsh_aliases.d.sh

@@ -127,13 +127,16 @@ EOF
 ALIAS_FILE="${DEST}/${ALIAS_DIR}/003_local.sh"
 cat >"${ALIAS_FILE}" <<-'EOF'
 	alias plocate='plocate --existing --basename --ignore-case'
-	alias wget="wget --content-disposition -c"
+	alias wget="wget --content-disposition -c -U 'User-Agent: Mozilla/5.0 (Windows NT 10.0; rv:109.0) Gecko/20100101 Firefox/115.0'"
+	alias tswget='torsocks wget'
 	alias leech="wget -e robots=off -c -r --level=0 -nc -np --random-wait"
 	alias bc='bc -lq'
 	alias shred='ionice -c3 /usr/bin/shred -fuzv'
 	alias wipe='ionice -c3 /usr/bin/wipe -l1 -v -r'
 	alias less="less -R"
 	alias youtube-dl='yt-dlp --downloader=aria2c'
+	#alias mpv='mpv --ao=alsa --force-window -af "crossfeed=strength=0.2:range=0.5:slope=0.5:level_in=0.9:level_out=1:block_size=1024"'
+	alias mpv='mpv --ao=pipewire --pipewire-buffer=47 --force-window'
 	alias tsmpv='torsocks mpv'
 	alias wtmpv='webtorrent --mpv --blocklist https://dbl.oisd.nl/ --upload-limit 20'
 	alias yt-dlp='yt-dlp --downloader=aria2c'
@@ -141,8 +144,8 @@ cat >"${ALIAS_FILE}" <<-'EOF'
 	alias tsy-dlp='torsocks yt-dlp'
 	alias tsyoutube-dl='torsocks yt-dlp'
 	alias tsy='tsy-dlp'
+	alias odc='~/bin/odysee-dl_low.sh hls-215'
 	alias tsleech='torsocks leech'
-	alias tswget='torsocks wget'
 	alias pastebinit='pastebinit -b paste.debian.net'
 	alias tspastebinit='torsocks pastebinit -b paste.debian.net'
 	alias baobab='dbus-run-session baobab'

020_zsh_quickstart.sh

@@ -170,6 +170,7 @@ cat <<-EOF | tee "${DEST}"/.zgen-local-plugins
 	zgenom ohmyzsh plugins/ssh-agent
 	zgenom ohmyzsh plugins/sudo
 	zgenom ohmyzsh plugins/vagrant
+	zgenom ohmyzsh plugins/docker
 
 	if [ \$(uname -a | grep -ci Darwin) = 1 ]; then
 	# Load OSX-specific plugins