install-on-tails.bash: fix persistent dot files path

Am I verifying signatures by key shipped with the signatures?

.gitignore

@@ -1,3 +1,4 @@
+~
 # All dotfiles
 .*
 

.gitmodules

@@ -22,3 +22,9 @@
 	path = submodules/serious-sans
 	url = https://github.com/kaBeech/serious-sans.git
 	branch = main
+[submodule "submodules/ssh-allowed_signers"]
+	path = submodules/ssh-allowed_signers
+	url = https://codeberg.org/Aminda/ssh-allowed_signers.git
+[submodule "submodules/pgp-alt-wot"]
+	path = submodules/pgp-alt-wot
+	url = https://codeberg.org/Aminda/pgp-alt-wot.git

CITATION.cff

@@ -1,18 +1,20 @@
-# @format
-
 # This CITATION.cff file was generated with cffinit.
-# Visit https://citation-file-format.github.io/cff-initializer-javascript/#/ to generate yours today!
+# Visit https://bit.ly/cffinit to generate yours today!
 
 cff-version: 1.2.0
-title: shell-things
+title: My dotfiles
-message: >-
+type: misc
-  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
+    email: suomalainen@mikaela.info
-  - given-names: git shortlog -sne
+    orcid: "https://orcid.org/0009-0003-8657-4653"
-repository-code: "https://gitea.blesmrt.net/Mikaela/shell-things"
+repository-code: "https://codeberg.org/Aminda/shell-things"
-abstract: dotfiles
+abstract: My dotfiles (also known as shell-things)
+keywords:
+  - dotfiles
+  - bash
+  - zsh
+  - etc
+  - linux
 license: BSD-3-Clause

conf/autoconfig.js.online

@@ -5,7 +5,7 @@
 
 // WARNING: lockPref() IS NOT ALLOWED HERE!
 
-//pref("autoadmin.global_config_url","https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js");
+//pref("autoadmin.global_config_url","https://codeberg.org/Aminda/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js");
 pref(
 	"autoadmin.global_config_url",
 	"file:///home/aminda/public_html/autoconfig.js",

conf/firefox-forbidden-policies.js

@@ -8,7 +8,7 @@
 lockPref("autoadmin.failover_to_cached", true);
 lockPref(
 	"autoadmin.global_config_url",
-	"https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js",
+	"https://codeberg.org/Aminda/shell-things/raw/branch/cxefa/conf/firefox-forbidden-policies.js",
 );
 lockPref("autoadmin.offline_failover", true);
 lockPref("autoadmin.refresh_interval", 120);

conf/librewolf.overrides.cfg

@@ -7,14 +7,14 @@
 // https://librewolf.net/docs/settings/
 // later eating https://aminda.eu/browser-extensions#firefox-aboutconfig
 // and finally becoming Firefox autoconfig file copied from
-// https://codeberg.org/librewolf/settings/src/branch/master/librewolf.cfg
+// https://codeberg.org/librewolf/settings/src/branch/cxefa/librewolf.cfg
 
 // NOTE! A lot is commented either for being a note, wrong, TODO, whatever, or most likely in my /etc/firefox/policies/policies.json
 
 // Firefox autoconfig
 pref(
 	"autoadmin.global_config_url",
-	"https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/librewolf.overrides.cfg",
+	"https://codeberg.org/Aminda/shell-things/raw/branch/cxefa/conf/librewolf.overrides.cfg",
 );
 //pref("general.config.obscure_value", 0);
 pref("autoadmin.refresh_interval", 120);
@@ -145,7 +145,7 @@ pref("browser.cache.memory.enable", true);
 //pref("browser.startup.homepage", "https://start.duckduckgo.com");
 //defaultPref("browser.startup.homepage", "about:mozilla");
 
-// https://codeberg.org/librewolf/settings/src/branch/master/librewolf.cfg begins
+// https://codeberg.org/librewolf/settings/src/branch/cxefa/librewolf.cfg begins
 
 /** [SECTION] CONTAINERS
  * enable containers and show the settings to control them in the stock ui

etc/firefox/policies/policies.json

@@ -307,7 +307,7 @@
 				"Comment": "Preference not allowed for stability reasons. :(",
 				"Status": "locked",
 				"Type": "string",
-				"Value": "https://gitea.blesmrt.net/mikaela/shell-things/raw/branch/master/conf/firefox-forbidden-policies.js"
+				"Value": "https://codeberg.org/Aminda/shell-things/raw/branch/cxefa/conf/firefox-forbidden-policies.js"
 			},
 			"autoadmin.offline_failover": {
 				"Comment": "Preference not allowed for stability reasons. :(",

install-on-tails.bash

@@ -0,0 +1,86 @@
+#!/usr/bin/env bash
+# Another take on my install script, but using symlinks and with a chance of
+# replacing the other ones.
+
+set +x
+# Tails appears to come with lsb_release and return Tails
+export DISTROID="$(lsb_release -si)"
+
+# Tails persistent directories
+export PERSISTDIR="$HOME/Persistent"
+export PERSISTDOTFILESDIR="/live/persistence/TailsData_unlocked/dotfiles"
+
+# This target directory
+export SHELL_THINGS_REPO="$HOME/Persistent/src/codeberg.org/Aminda/shell-things"
+
+# WARNING!
+printf "USING THESE FILES IS EVEN MORE DANGEROUS ON TAILS THAN IN GENERAL.\n"
+printf "PLEASE DON'T DO THIS EVEN IF THOU ART I. THOU HAVE BEEN WARNED!\n"
+sleep 3
+
+# NOTE!
+if [[ $DISTROID != "Tails" ]]; then
+	printf "\nThis distro identifies itself as $DISTROID instead of Tails...\n"
+	sleep 3
+fi
+
+# WARNING again!
+if [[ ! -d "$PERSISTDIR" ]]; then
+	printf "\nWARNING! Persistent directory not found, Tails may not be setup"
+	printf " correctly. To override:\n\tmkdir -vp $PERSISTDIR \n\n"
+	sleep 3
+	exit 1
+fi
+
+# THIS IS YOUR FINAL WARNING!
+if [[ ! -d "$PERSISTDOTFILESDIR" ]]; then
+	printf "\nWARNING! $PERSISTDOTFILESDIR directory not found, check"
+	printf "\npersistent storage settings To override:\n"
+	printf "\tmkdir -vp $PERSISTDOTFILESDIR \n\n"
+	sleep 3
+	exit 1
+fi
+
+# This is just a copy-paste of my nastyish function
+if [ -d "$SHELL_THINGS_REPO" ]; then
+	printf "$SHELL_THINGS_REPO exists, git pulling...\n\n"
+	cd $SHELL_THINGS_REPO
+	git remote set-url origin https://codeberg.org/Aminda/shell-things.git
+	git fetch --all
+	git checkout -b cxefa origin/cxefa > /dev/null 2>&1
+	git pull
+	git submodule update --init
+	git config --global gpg.ssh.allowedSignersFile "$SHELL_THINGS_REPO/submodules/ssh-allowed_signers/allowed_signers"
+	sleep 3
+	git verify-commit HEAD || exit 1
+	sleep 3
+else
+	printf "shell-things: $SHELL_THINGS_REPO doesn't exist, cloning...\n\n"
+	git clone https://codeberg.org/Aminda/shell-things.git $SHELL_THINGS_REPO
+	cd $SHELL_THINGS_REPO
+fi
+
+cd
+
+# bash
+cp -v $SHELL_THINGS_REPO/rc/bashrc $PERSISTDOTFILESDIR/.bashrc
+ln -nsfv $PERSISTDOTFILESDIR/.bashrc $HOME/
+# zsh
+cp -v $SHELL_THINGS_REPO/rc/zshrc $PERSISTDOTFILESDIR/.zshrc
+ln -nsfv $PERSISTDOTFILESDIR/.zshrc $HOME/
+# tmux
+cp -v $SHELL_THINGS_REPO/conf/tmux.conf $PERSISTDOTFILESDIR/.tmux.conf
+ln -nsfv $PERSISTDOTFILESDIR/.tmux.conf $HOME/
+# git
+git config --global gpg.ssh.allowedSignersFile $PERSISTDIR/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers
+cp $SHELL_THINGS_REPO/conf/gitconfig $PERSISTDOTFILESDIR/.gitconfig
+ln -nsfv $PERSISTDOTFILESDIR/.gitconfig $HOME/
+
+# Hack for directories expecting it to work, although only for this boot
+ln -nsfv $SHELL_THINGS_REPO $HOME/.shell-things
+
+# Let's go home
+cd
+
+set -x
+# vim: filetype=bash

rc/bashrc

@@ -749,7 +749,7 @@ function shell-things {
 		cd $SHELL_THINGS_REPO
 		git remote set-url origin https://codeberg.org/Aminda/shell-things.git
 		git fetch --all
-		git checkout -b cxefa origin/cxefa
+		git checkout -b cxefa origin/cxefa > /dev/null 2>&1
 		git pull
 		echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers"
 		git verify-commit HEAD || exit 1

rc/zshrc

@@ -735,7 +735,7 @@ function shell-things {
 		cd $SHELL_THINGS_REPO
 		git remote set-url origin https://codeberg.org/Aminda/shell-things.git
 		git fetch --all
-		git checkout -b cxefa origin/cxefa
+		git checkout -b cxefa origin/cxefa > /dev/null 2>&1
 		git pull
 		echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers"
 		git verify-commit HEAD || exit 1

submodules/pgp-alt-wot

@@ -0,0 +1 @@
+Subproject commit 7e1601e5d6b10da8816c396f21c3168ab2340e22

submodules/ssh-allowed_signers

@@ -0,0 +1 @@
+Subproject commit 770c1ee98e52699d6a4219331d013f732f7b4fc0