install: cat to cp

.mikaela_install

@@ -10,55 +10,55 @@ git verify-commit HEAD || exit 1
 
 # Place my personal more questionable aliases in place, except that I don't
 # actually use them as I keep forgetting about them.
-cat .mikaela/bash_aliases >~/.bash_aliases
+cp -v .mikaela/bash_aliases $HOME/.bash_aliases
-cat .mikaela/zsh_aliases >~/.zsh_aliases
+cp -v .mikaela/zsh_aliases $HOME/.zsh_aliases
 
 # I still question whether xinitrc gets read under wayland, but I am not
 # about to start removing this legacy config, just in case of something
 # unexpected.
-cat rc/xinitrc >~/.xinitrc
+cp -v rc/xinitrc $HOME/.xinitrc
 
 # My gnupg configuration with questionable options such as always
 # encrypting to me, so paws off.
 mkdir -p ~/.gnupg
-cat .mikaela/gpg.conf >~/.gnupg/gpg.conf
+cp -v .mikaela/gpg.conf $HOME/.gnupg/gpg.conf
 
 # my name and all in pastes made through pastebinit, if it still even exists
-cat .mikaela/pastebinit.xml >~/.pastebinit.xml
+cp -v .mikaela/pastebinit.xml $HOME/.pastebinit.xml
 
 # may change your language to Finnish or do other fun someone else than I
 # wouldn't expect
-cat .mikaela/environment >~/.environment
+cp -v .mikaela/environment $HOME/.environment
 
 # my git configuration including the names, addresses, public keys, etc.
 mkdir ~/.config/git
 git config --global --add include.path '~/.shell-things/.mikaela/gitconfig'
-cat .gitattributes >~/.config/git/attributes
+cp -v .gitattributes $HOME/.config/git/attributes
 
 # unless thou art I, thou don't want my authorized_keys on your system.
 mkdir -p ~/.ssh
-cat .mikaela/keys/authorized_keys >~/.ssh/authorized_keys
+cp -v .mikaela/keys/authorized_keys $HOME/.ssh/authorized_keys
-cat etc/ssh/ssh_config >~/.ssh/config
+cp -v etc/ssh/ssh_config $HOME/.ssh/config
 
 # Text editor configuration (with a lot of bloat) that shouldn't be reached
 # anyway since every project should have its own not so bloated editorconfig.
-cat .editorconfig >~/.editorconfig
+cp -v .editorconfig $HOME/.editorconfig
 
 # Is Firefox installed to the location I generally use? Then apply my
 # autoconfigs. These are very surprising and unexpected unless thou art I,
 # thou have been warned.
 if [ -d ~/.local/firefox/defaults/pref/ ]; then
-	cat conf/autoconfig.js >~/.local/firefox/defaults/pref/autoconfig.js
+	cp -v conf/autoconfig.js $HOME/.local/firefox/defaults/pref/autoconfig.js
-	#cat conf/librewolf.overrides.cfg >~/.local/firefox/librewolf.overrides.cfg
+	#cp -v conf/librewolf.overrides.cfg $HOME/.local/firefox/librewolf.overrides.cfg
-	cat conf/firefox-forbidden-policies.js >~/.local/firefox/firefox-forbidden-policies.js
+	cp -v conf/firefox-forbidden-policies.js $HOME/.local/firefox/firefox-forbidden-policies.js
 fi
-#cat conf/librewolf.overrides.cfg >~/public_html/autoconfig.js
+#cp -v conf/librewolf.overrides.cfg $HOME/public_html/autoconfig.js
-cat conf/firefox-forbidden-policies.js >~/public_html/autoconfig.js
+cp -v conf/firefox-forbidden-policies.js $HOME/public_html/autoconfig.js
 mkdir -p ~/.librewolf/ ~/.var/app/io.gitlab.librewolf-community/.librewolf/
-#cat conf/librewolf.overrides.cfg >~/.librewolf/librewolf.overrides.cfg
+#cp -v conf/librewolf.overrides.cfg $HOME/.librewolf/librewolf.overrides.cfg
-cat conf/firefox-forbidden-policies.js >~/.librewolf/librewolf.overrides.cfg
+cp -v conf/firefox-forbidden-policies.js $HOME/.librewolf/librewolf.overrides.cfg
-#cat conf/librewolf.overrides.cfg >~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
+#cp -v conf/librewolf.overrides.cfg $HOME/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
-cat conf/firefox-forbidden-policies.js >~/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
+cp -v conf/firefox-forbidden-policies.js $HOME/.var/app/io.gitlab.librewolf-community/.librewolf/librewolf.overrides.cfg
 
 # Mainly KDE Plasma Integration extension support, but there may be GNOME
 # and similar there too

conf/tails-persistence.conf

@@ -0,0 +1,6 @@
+# admin:///live/persistence/TailsData_unlocked/persistence.conf
+# paws off. Dangerous to do anything not permitted by
+# https://tails.net/doc/persistent_storage/additional_software/dangerzone/index.en.html
+# or other documentation in tails.net. Do as I say, not as I do.
+
+# vim: filetype=conf

install

@@ -5,16 +5,16 @@ set -x
 
 # If my allowed_signers are present, use them, if not, clone them, and try
 # again. The gitconfig expects them here.
-if [ -d ~/src/codeberg.org/Aminda/ssh-allowed_signers ]; then
+if [ -d $HOME/src/codeberg.org/Aminda/ssh-allowed_signers ]; then
-	echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers"
+	echo "git config --global gpg.ssh.allowedSignersFile $HOME/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers"
 	git verify-commit HEAD || exit 1
 	sleep 3
 else
 	echo "Keys not found, cloning..."
 	# -vp - verbose, parent. This comment won't be repeated.
-	mkdir -vp ~/src/codeberg.org/Aminda/
+	mkdir -vp $HOME/src/codeberg.org/Aminda/
-	git clone https://codeberg.org/Aminda/ssh-allowed_signers.git ~/src/codeberg.org/Aminda/ssh-allowed_signers
+	git clone https://codeberg.org/Aminda/ssh-allowed_signers.git $HOME/src/codeberg.org/Aminda/ssh-allowed_signers
-	echo "git config --global gpg.ssh.allowedSignersFile ~/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers"
+	echo "git config --global gpg.ssh.allowedSignersFile $HOME/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers"
 	git verify-commit HEAD || exit 1
 	sleep 3
 fi
@@ -23,64 +23,64 @@ fi
 # my public keys as authorized. See bottom of this script.
 export MIKAELA_GREP=$HOME/.MIKAELA_GREP
 
-# catting the files around, cat used in hopes of not touching permissions
+# Copying files in places
-cat rc/bashrc > ~/.bashrc
+cp -v rc/bashrc $HOME/.bashrc
-cat conf/tmux.conf > ~/.tmux.conf
+cp -v conf/tmux.conf $HOME/.tmux.conf
-cat rc/zshrc > ~/.zshrc
+cp -v rc/zshrc $HOME/.zshrc
-cat rc/profile > ~/.profile
+cp -v rc/profile $HOME/.profile
 
 # Git config, legacy support for old location as well.
 # The other script appends sourced file, so if thou aren't I, thou should
-# consider it as well; `git config --global --add include.path '~/yourgitconfig'`
+# consider it as well; `git config --global --add include.path '$HOME/yourgitconfig'`
-mkdir -vp ~/.config/git
+mkdir -vp $HOME/.config/git
-cat conf/gitconfig > ~/.config/git/config
+cp -v conf/gitconfig $HOME/.config/git/config
-touch ~/.gitconfig
+touch $HOME/.gitconfig
-rm ~/.gitconfig
+rm $HOME/.gitconfig
-ln -nsfv ~/.config/git/config ~/.gitconfig
+ln -nsfv $HOME/.config/git/config $HOME/.gitconfig
 # Used for `git init` and `git clone`, will contain pre-commit hooks
-mkdir -vp ~/.git-template
+mkdir -vp $HOME/.git-template
 
 # {n,neo}vim
-cat rc/vimrc > ~/.vimrc
+cp -v rc/vimrc $HOME/.vimrc
-mkdir -vp ~/.config/nvim/
+mkdir -vp $HOME/.config/nvim/
-cat conf/init.vim > ~/.config/nvim/init.vim
+cp -v conf/init.vim $HOME/.config/nvim/init.vim
-cat conf/makepkg.conf > ~/.makepkg.conf
+cp -v conf/makepkg.conf $HOME/.makepkg.conf
 
 # the media player
-mkdir -vp ~/.config/mpv/
+mkdir -vp $HOME/.config/mpv/
-cat conf/mpv.conf > ~/.config/mpv/mpv.conf
+cp -v conf/mpv.conf $HOME/.config/mpv/mpv.conf
 
 # if I am performing ident spoofing already, I don't want to touch it
-if [ ! -f ~/.oidentd.conf ]; then
+if [ ! -f $HOME/.oidentd.conf ]; then
-	cat conf/oidentd.conf > ~/.oidentd.conf
+	cp -v conf/oidentd.conf $HOME/.oidentd.conf
 fi
 
 # In addition to git, my gnupg configuration should be questioned
-mkdir -vp ~/.gnupg
+mkdir -vp $HOME/.gnupg
-cat gpg/gpg.conf > ~/.gnupg/gpg.conf
+cp -v gpg/gpg.conf $HOME/.gnupg/gpg.conf
-cat gpg/gpg-agent.conf > ~/.gnupg/gpg-agent.conf
+cp -v gpg/gpg-agent.conf $HOME/.gnupg/gpg-agent.conf
-cat gpg/dirmngr.conf > ~/.gnupg/dirmngr.conf
+cp -v gpg/dirmngr.conf $HOME/.gnupg/dirmngr.conf
 # Issues with GPG? SIGHUP dirmngr
 killall -HUP dirmngr
 
 # I don't remember using these in ages and I don't think they apply to
 # wayland
-#cat rc/xinitrc > ~/.xinitrc
+#cp -v rc/xinitrc $HOME/.xinitrc
-cat conf/pastebinit.xml > ~/.pastebinit.xml
+cp -v conf/pastebinit.xml $HOME/.pastebinit.xml
-cat conf/Xresources > ~/.Xresources
+cp -v conf/Xresources $HOME/.Xresources
 
 # Nice sysinfo script
-mkdir -vp ~/.inxi
+mkdir -vp $HOME/.inxi
-cat conf/inxi.conf > ~/.inxi/inxi.conf
+cp -v conf/inxi.conf $HOME/.inxi/inxi.conf
 
 # laziness
 gpg --quiet --import .mikaela/keys/*.asc &
 
 # Utilized by my ssh_config (not to be confused with sshd_config)
-mkdir -vp ~/.ssh/sockets/
+mkdir -vp $HOME/.ssh/sockets/
 
 # It will get used later
-mkdir -vp ~/.local/bin/
+mkdir -vp $HOME/.local/bin/
 
 # Setting permissions
 chmod a+xr chmod
@@ -91,14 +91,14 @@ git submodule update --init &
 
 # Aforementioned git template directory and pre-commit
 if hash pre-commit 2> /dev/null; then
-	pre-commit init-templatedir ~/.git-template
+	pre-commit init-templatedir $HOME/.git-template
 	pre-commit gc
 fi
 
-# If symlinks are installed, remove dead/dangling ones from ~/.local/bin
+# If symlinks are installed, remove dead/dangling ones from $HOME/.local/bin
 # so corepack won't get confused if those are present
 if hash symlinks 2> /dev/null; then
-	symlinks -d ~/.local/bin/
+	symlinks -d $HOME/.local/bin/
 else
 	echo "WARNING! Executable named symlinks not found in PATH."
 	sleep 3
@@ -108,8 +108,8 @@ fi
 if hash corepack 2> /dev/null; then
 	# Will install symlinks for pnpm, yarn, etc., but not npm unless
 	# explicitly requested as below
-	corepack enable --install-directory ~/.local/bin/
+	corepack enable --install-directory $HOME/.local/bin/
-	corepack enable npm --install-directory ~/.local/bin/
+	corepack enable npm --install-directory $HOME/.local/bin/
 	# pnpm can utilize the same packagemanager field as corepack, even when
 	# used alone
 	corepack pnpm config set manage-package-manager-versions=true

install-on-tails.bash

@@ -2,7 +2,7 @@
 # Another take on my install script, but using symlinks and with a chance of
 # replacing the other ones.
 
-set +x
+set -x
 # Tails appears to come with lsb_release and return Tails
 export DISTROID="$(lsb_release -si)"
 
@@ -75,6 +75,12 @@ ln -nsfv $PERSISTDOTFILESDIR/.tmux.conf $HOME/
 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/
+git config --global gpg.ssh.allowedSignersFile "$SHELL_THINGS_REPO/submodules/ssh-allowed_signers/allowed_signers"
+
+# Ensure existence of netrc & curlrc for easing git over https
+touch $PERSISTDOTFILESDIR/.{netrc,curlrc}
+ln -nsfv $PERSISTDOTFILESDIR/.netrc $HOME/
+ln -nsfv $PERSISTDOTFILESDIR/.curlrc $HOME/
 
 # Hack for directories expecting it to work, although only for this boot
 ln -nsfv $SHELL_THINGS_REPO $HOME/.shell-things
@@ -82,5 +88,5 @@ ln -nsfv $SHELL_THINGS_REPO $HOME/.shell-things
 # Let's go home
 cd
 
-set -x
+set +x
 # vim: filetype=bash

local/share/dark-mode.d/00-do-not-repeat-yourself.bash

@@ -2,12 +2,12 @@
 
 set -x
 
-if ! hash lsb_release 2> /dev/null; then
+#if ! hash lsb_release 2> /dev/null; then
-	ERRORMESSAGE="lsb_release was not found, the wallpaper scripts cannot figure out the distribution"
+#	ERRORMESSAGE="lsb_release was not found, the wallpaper scripts cannot figure out the distribution"
-	echo "$ERRORMESSAGE"
+#	echo "$ERRORMESSAGE"
-	notify-send --app-name=darkman --icon=error "$ERRORMESSAGE"
+#	notify-send --app-name=darkman --icon=error "$ERRORMESSAGE"
-	exit 0
+#	exit 0
-fi
+#fi
 
 #if ! hash kvantummanager 2> /dev/null; then
 #	ERRORMESSAGE="kvantummanager wasn't found, Qt theme switching won't work!"
@@ -16,12 +16,16 @@ fi
 #	exit 0
 #fi
 
-export DISTROID="$(lsb_release -si)"
+#export DISTROID="$(lsb_release -si)"
-export DISTROREL="$(lsb_release -sr)"
+#export DISTROREL="$(lsb_release -sr)"
+
+if [ -f /etc/os-release ]; then
+	. /etc/os-release
+fi
 
 export DARKMANGET="$(darkman get)"
 
-printf "Distribution: $DISTROID\nRelease: $DISTROREL\nMode: $DARKMANGET\n"
+printf "Distribution: $ID\nRelease: $VERSION_ID\nMode: $DARKMANGET\n"
 
 if [[ "$DARKMANGET" -eq "light" ]]; then
 	notify-send --app-name="darkman" --urgency=low --icon=weather-clear-night "Teema: $DARKMANGET"

local/share/dark-mode.d/13-plasma-distro-themes.bash

@@ -2,6 +2,6 @@
 
 . ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
-if [[ "$DISTROID" == "Kali" ]]; then
+if [[ "$ID" == "kali" ]]; then
 	lookandfeeltool --platform offscreen --apply "Kali-Purple-Dark"
 fi

local/share/dark-mode.d/15-wallpaper-dark.bash

@@ -4,15 +4,15 @@
 
 if [ -f ~/.wallpaper.dark ]; then
 	export WALLPAPER_PATH="$HOME/.wallpaper.dark"
-elif [ "$DISTROID" == "Fedora" ]; then
+elif [ "$ID" == "fedora" ]; then
-	export WALLPAPER_PATH="/usr/share/wallpapers/F$DISTROREL/contents/images_dark/3840x2160.png"
+	export WALLPAPER_PATH="/usr/share/wallpapers/F$VERSION_ID/contents/images_dark/3840x2160.png"
-elif [ "$DISTROID" == "Kali" ]; then
+elif [ "$ID" == "kali" ]; then
 	export WALLPAPER_PATH="/usr/share/wallpapers/KaliMetalDark/contents/images/3840x2160.png"
 fi
 
 echo "Wallpaper: $WALLPAPER_PATH"
 
-if [ "$DISTROID" == "Arch" ]; then
+if [ "$ID" == "arch" ]; then
 	qdbus6 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
 else
 	qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'

local/share/light-mode.d/13-plasma-distro-themes.bash

@@ -2,8 +2,8 @@
 
 . ~/.local/share/dark-mode.d/00-do-not-repeat-yourself.bash
 
-if [[ "$DISTROID" == "Kali" ]]; then
+if [[ "$ID" == "kali" ]]; then
 	lookandfeeltool --platform offscreen --apply "Kali-Purple-Light"
-elif [[ "$DISTROID" == "Fedora" ]]; then
+elif [[ "$ID" == "fedora" ]]; then
 	lookandfeeltool --platform offscreen --apply "org.fedoraproject.fedora.desktop"
 fi

local/share/light-mode.d/15-wallpaper-light.bash

@@ -4,15 +4,15 @@
 
 if [ -f ~/.wallpaper.light ]; then
 	export WALLPAPER_PATH="$HOME/.wallpaper.light"
-elif [ "$DISTROID" == "Fedora" ]; then
+elif [ "$ID" == "fedora" ]; then
-	export WALLPAPER_PATH="/usr/share/wallpapers/F$DISTROREL/contents/images/3840x2160.png"
+	export WALLPAPER_PATH="/usr/share/wallpapers/F$RELEASE_ID/contents/images/3840x2160.png"
-elif [ "$DISTROID" == "Kali" ]; then
+elif [ "$ID" == "kali" ]; then
 	export WALLPAPER_PATH="/usr/share/wallpapers/KaliMetal/contents/images/3840x2160.jpg"
 fi
 
 echo "Wallpaper: $WALLPAPER_PATH"
 
-if [ "$DISTROID" == "Arch" ]; then
+if [ "$ID" == "arch" ]; then
 	qdbus6 org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'
 else
 	qdbus org.kde.plasmashell /PlasmaShell org.kde.PlasmaShell.evaluateScript 'var allDesktops = desktops();print (allDesktops);for (i=0;i<allDesktops.length;i++) {d = allDesktops[i];d.wallpaperPlugin = "org.kde.image";d.currentConfigGroup = Array("Wallpaper", "org.kde.image", "General");d.writeConfig("Image", "file://'$WALLPAPER_PATH'")}'

rc/bashrc

@@ -25,6 +25,11 @@ fi
 #	Aliases						RJ706I
 #	Functions					ZGC5QQ
 
+# lsb_base ?
+if [ -f /etc/os-release ]; then
+	. /etc/os-release
+fi
+
 #####	Defaults etc...				M0TZLS	#####
 
 # ~/.bashrc: executed by bash(1) for non-login shells.
@@ -219,7 +224,7 @@ fi
 TZ=$(date +%Z)
 
 # Sets PATH. To add another path, add :</path/to/new/path> to string below.
-PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/snap/bin:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
+PATH=$HOME/.local/bin:$HOME/bin:$HOME/Persistent/.local/bin:$HOME/Persistent/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/snap/bin:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
 
 # Colours to less
 # Copied from https://nion.modprobe.de/blog/archives/572-less-colors-for-man-pages.html

rc/zshrc

@@ -25,6 +25,11 @@ fi
 #	Aliases						RJ706I
 #	Functions					ZGC5QQ
 
+# lsb_base ?
+if [ -f /etc/os-release ]; then
+	. /etc/os-release
+fi
+
 # Kind of my welcome screen when I open a terminal?
 # Existence of lsb_release implies both being on Linux and me having touched
 # the system, so I can do away with a lot of checks for Darwin
@@ -180,7 +185,7 @@ fi
 TZ=$(date +%Z)
 
 # Sets PATH. To add another path, add :</path/to/new/path> to string below.
-PATH=$HOME/.local/bin:$HOME/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/snap/bin:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
+PATH=$HOME/.local/bin:$HOME/bin:$HOME/Persistent/.local/bin:$HOME/Persistent/bin:$HOME/go/bin:$HOME/.local/share/flatpak/exports/bin:/var/lib/flatpak/exports/bin:/usr/local/bin:/usr/local/sbin:/usr/local/games:/snap/bin:/usr/bin:/usr/sbin:/usr/games:/bin:/sbin:/games:$PATH
 
 # Colours to less
 # Copied from https://nion.modprobe.de/blog/archives/572-less-colors-for-man-pages.html