2026-04-24

Author: hyperupcall

Bakefile.sh

@@ -16,6 +16,7 @@ task.bootstrap() {
 }
 
 task.init() {
+	# TODO: Remove when transform is implemented
 	cat > .clangd <<EOF
 # DO NOT MODIFY! This file is auto-autogenerated from Bakefile.sh.
 CompileFlags:
@@ -25,11 +26,6 @@ EOF
 		printf '%s\n' '.clangd' >>.git/info/exclude
 	fi
 
-	if ! mise trust --cd ~/.dotfiles --show mise | grep -q '~/.dotfiles: trusted'; then
-		if ! output=$(mise trust ~/.dotfiles/.mise.toml 2>&1); then
-			printf '%s\n' "$output"
-		fi
-	fi
 	if [ ! -f ./.git/info/lefthook.checksum ]; then
 		lefthook install
 	fi

bootstrap-linux.sh

@@ -1,6 +1,38 @@
 #!/usr/bin/env sh
 set -e
 
+installcmd() {
+	if iscmd "$1"; then
+		log "Already installed $1"
+	else
+		log "Installing $1"
+
+		if iscmd 'pacman'; then
+			run sudo pacman -S --noconfirm "$2"
+		elif iscmd 'apt-get'; then
+			run sudo apt-get -y install "$2"
+		elif iscmd 'dnf'; then
+			run sudo dnf -y install "$2"
+		elif iscmd 'zypper'; then
+			run sudo zypper -n install "$2"
+		elif iscmd 'eopkg'; then
+			run sudo eopkg -y install "$2"
+		elif iscmd 'brew'; then
+			run brew install "$2"
+		else
+			die 'Failed to determine package manager'
+		fi
+
+		if ! iscmd "$1"; then
+			die "Automatic installation of $1 failed"
+		fi
+	fi
+}
+
+if [ -n "$FORCE_SOURCE" ]; then
+	return 0
+fi
+
 # shellcheck disable=SC3028,SC3054,SC2039
 if [ -n "$BASH" ] && [ "${BASH_SOURCE[0]}" != "$0" ]; then
 	printf '%s\n' "Error: This file should not be sourced"
@@ -39,7 +71,9 @@ main() {
 	run ~/.dotfiles/bake bootstrap
 
 	# Symlink ~/scripts.
-	run ln -fs ~/.dotfiles/hscripts ~/
+	if [ ! -d ~/scripts ]; then
+		run ln -sf ~/.dotfiles/hscripts ~/scripts
+	fi
 
 	# Export variables.
 	cat >~/.bootstrap/bootstrap-out.sh <<EOF
@@ -128,34 +162,6 @@ updatesystem() {
 	fi
 }
 
-installcmd() {
-	if iscmd "$1"; then
-		log "Already installed $1"
-	else
-		log "Installing $1"
-
-		if iscmd 'pacman'; then
-			run sudo pacman -S --noconfirm "$2"
-		elif iscmd 'apt-get'; then
-			run sudo apt-get -y install "$2"
-		elif iscmd 'dnf'; then
-			run sudo dnf -y install "$2"
-		elif iscmd 'zypper'; then
-			run sudo zypper -n install "$2"
-		elif iscmd 'eopkg'; then
-			run sudo eopkg -y install "$2"
-		elif iscmd 'brew'; then
-			run brew install "$2"
-		else
-			die 'Failed to determine package manager'
-		fi
-
-		if ! iscmd "$1"; then
-			die "Automatic installation of $1 failed"
-		fi
-	fi
-}
-
 clonerepo() {
 	if [ -d "$2" ]; then
 		log "Already cloned $1"

config/setup.sh

@@ -32,3 +32,15 @@ fi
 CURL_CONFIG="$HOME/.dotfiles/config/curl_config.conf"
 
 source ~/.dotfiles/config/setup-private.sh
+
+util.is_in_container_or_chroot() {
+	if command -v systemd-detect-virt &>/dev/null; then
+		systemd-detect-virt --quiet --container || systemd-detect-virt --quiet --chroot
+	else
+		local stat1= stat2=
+		stat1=$(stat -c %i /)
+		stat2=$(stat -c %i /proc/1/root)
+
+		[ -e /.dockerenv ] && (( stat1 != stat2 ))
+	fi
+}

docs/installation-unix.md

@@ -40,41 +40,23 @@ chmod +x ~/.bootstrap/bootstrap.sh
 The bootstrap script performs the following steps:
 
 - Installs Homebrew on macOS
-- Installs cURL, Git and Vim
+- Installs cURL, Git, Vim, and Zsh
 - Clones `hyperupcall/dotfiles` to `~/.dotfiles`
 - Symlinks `~/scripts` to `~/.dotfiles/scripts`
 - Creates `~/.bootstrap/bootstrap-out.sh`. Sourcing it:
   - Sets `NAME`, `EMAIL`, `EDITOR`, and `VISUAL`
-  - Prepends `$HOME/.dotfiles/.data/bin` to `PATH`
+  - Prepends `$HOME/.dotfiles/.data/bin` and `$HOME/.locall/bin` to `PATH`
   - Sources `~/.dotfiles/config/xdg.sh`, if it exists
 
 ## Next Steps
 
 Additional scripts should be executed. They include:
 
 - `. ~/.bootstrap/bootstrap-out.sh`
+- If on Ubuntu, run `sudo apt-get remove coreutils-from-uutils --allow-remove-essential`
 - `~/scripts/rare/transfer-secrets.sh`
-  - Transfer SSH, PGP files to computer
 - Setup ZFS, BTRFS
 - `~/scripts/doctor.sh`
-  - Install required dependencies
-  - Fix files in home directory
-    - Remove broken home directory symlinks
-    - Remove autoappended lines in shell startup files
-    - Create necessary symlinks
-    - Set XDG user directories
-    - Symlink XDG base and user directories
-    - Add and remove necessary directories, files, and groups
-  - Write to `~/.dotfiles/.data/{profile,github_token}`
-  - Check permissions for `~/.{ssh,gnupg}`
-  - Setup [dev](https://github.com/fox-incubating/dev)
-    - Install NodeJS v23.6.0
-  - Setup [d](https://github.com/fox-incubating/d)
-  - Setup mise and lefthook
-    - Configure for `~/.dotfiles`
-  - Setup Git (at least v2.37.0)
-  - Setup Neovim (at least v0.10.0)
-  - Setup pass
   - Setup Browsers (Firefox, Brave)
     - Backup and restore settings (_do manually_):
       - uBlacklist

hscripts/backup-home.sh

@@ -16,13 +16,15 @@ main() {
 			--exclude '**/Steam/steamapps' \
 			--exclude '**/Steam/ubuntu12_32' \
 			--exclude '**/Steam/ubuntu12_64' \
+			--exclude '**/Steam/appcache' \
 			--exclude '**/*.git' \
 			--exclude '**/*.hg' \
 			--exclude '**/*.svn' \
 			--exclude '**/google-fonts-repository' \
 			--exclude '**/brave-browser*' \
 			--exclude '**/chromium*' \
 			--exclude '**/firefox*' \
+			--exclude '**/mozilla-unified*' \
 			--exclude '**/llvm-project*' \
 			--exclude '**/gcc*' \
 			--exclude '**/android*' \
@@ -32,8 +34,12 @@ main() {
 			--exclude '**/node_modules' \
 			--exclude '**/.npm/_cacache' \
 			--exclude '**/pnpm/store' \
+			--exclude '**/.rustup/toolchains' \
 			--exclude '**/rustup/toolchains' \
+			--exclude '**/.cargo/registry' \
 			--exclude '**/cargo/registry' \
+			--exclude "$HOME/go" \
+			--exclude "$HOME/.gopath" \
 			--exclude '**/mise/installs' \
 			--exclude '**/miniforge3/pkgs' \
 			--exclude '**/miniforge3/envs' \
@@ -50,6 +56,9 @@ main() {
 			--exclude "$XDG_DATA_HOME/gradle/jdks" \
 			--exclude "$XDG_DATA_HOME/flatpak/repo/objects" \
 			--exclude "$XDG_DATA_HOME/flatpak/runtime" \
+			--exclude "$XDG_DATA_HOME/flatpak/appstream" \
+			--exclude "$XDG_DATA_HOME/Jan" \
+			--exclude "$XDG_DATA_HOME/uv" \
 			--exclude '**/target' \
 			--exclude '**/target-*' \
 			--exclude '**/dist' \
@@ -65,7 +74,7 @@ main() {
 			--exclude '**/youtube-dl' \
 			--exclude '**/.cache' \
 			--exclude '**/*.iso' \
-			"$backup_dir"::'backup-{now}-{hostname}' \
+			"$backup_dir"::'backup-{now:%Y-%m-%d_%H:%M:%S}-{hostname}' \
 			"$save_dir"
 	fi
 }

hscripts/doctor.sh

@@ -272,25 +272,29 @@ main() {
 		must.strict_permissions ~/.gnupg/ ~/.gnupg/*
 
 		if [[ $computer_profile == @(desktop|laptop) ]]; then
-			if gpg --list-keys 0x2FB93BF35E14E7C4 &>/dev/null; then
-				core.print_info "Has gpg key \"Edwin Kofler (FOR PASSWORDS ONLY) <edwin@kofler.dev>\""
+			if gpg --list-keys "$_private_gpgkey1_id" &>/dev/null; then
+				core.print_info "Has gpg key \"$_private_gpgkey1_user\""
 			else
-				core.print_info "Does not have gpg key \"Edwin Kofler (FOR PASSWORDS ONLY) <edwin@kofler.dev>\""
+				core.print_info "Does not have gpg key \"$_private_gpgkey1_user\""
 			fi
-			if gpg --list-keys 0x3851E5FD042C7C6C &>/dev/null; then
-				core.print_info "Has gpg key \"Edwin Kofler <edwin@kofler.dev>\""
+			if gpg --list-keys "$_private_gpgkey2_id" &>/dev/null; then
+				core.print_info "Has gpg key \"$_private_gpgkey2_user\""
 			else
-				core.print_die "Does not have gpg key \"Edwin Kofler <edwin@kofler.dev>\""
+				core.print_die "Does not have gpg key \"$_private_gpgkey2_user\""
 			fi
 		fi
 	}
 
+	~/scripts/setup/juno-computers.sh
+
 	# Install the most paramount tools.
 	~/scripts/setup/d.sh
 	~/scripts/setup/zsh.sh
 	~/scripts/setup/ksh.sh
 	~/scripts/setup/rust.sh
 	~/scripts/setup/mise.sh
+	~/scripts/setup/neovim.sh
+
 
 	# Install personal tools.
 	#~/scripts/setup/npm.sh
@@ -310,7 +314,6 @@ main() {
 	~/scripts/setup/git.sh
 
 	# Install applications.
-	~/scripts/setup/neovim.sh
 	~/scripts/setup/firefox.sh
 	~/scripts/setup/librewolf.sh
 	~/scripts/setup/brave.sh
@@ -581,6 +584,7 @@ must.strict_permissions() {
 
 dependencies.debian() {
 	local packages=()
+	packages+=(xdg-user-dirs)
 	packages+=(apt-transport-https build-essential)
 	packages+=(bash-completion curl rsync cmake ccache vim nano jq lvm2) # lint-ignore:curl-must-have-args
 	packages+=(pkg-config libssl-dev)                                    # For starship
@@ -592,6 +596,7 @@ dependencies.ubuntu() {
 }
 dependencies.fedora() {
 	local packages=()
+	packages+=(xdg-user-dirs)
 	packages+=(@development-tools)
 	packages+=(bash-completion curl rsync cmake ccache vim nano jq lvm2) # lint-ignore:curl-must-have-args
 	packages+=(pkg-config openssl-devel)                                 # For starship
@@ -601,6 +606,7 @@ dependencies.fedora() {
 }
 dependencies.opensuse() {
 	local packages=()
+	packages+=(xdg-user-dirs)
 	packages+=(bash-completion curl rsync cmake ccache vim nano jq lvm2) # lint-ignore:curl-must-have-args
 	packages+=(pkg-config openssl-devel)                                 # For starship
 
@@ -609,6 +615,7 @@ dependencies.opensuse() {
 }
 dependencies.arch() {
 	local packages=()
+	packages+=(xdg-user-dirs)
 	packages+=(base-devl lvm2 openssl yay)
 
 	sudo pacman -Syu --noconfirm "${packages[@]}"

hscripts/transfer-data.sh

@@ -1,7 +1,20 @@
 #!/usr/bin/env bash
-source ~/.dotfiles/config/setup.sh
+# DO NOT source setup.sh here. Otherwise, "_private" variables
+# cannot be accessed. This needs to be standalone and work before
+# running "doctor.sh".
 
 main() {
+	FORCE_SOURCE=1 source ~/.dotfiles/bootstrap-linux.sh
+	installcif [ -n "$FORCE_SOURCE" ]; then
+		return 0
+fi
+
+# shellcheck disable=SC3028,SC3054,SC2039
+if [ -n "$BASH" ] && [ "${BASH_SOURCE[0]}" != "$0" ]; then
+		printf '%s\n' "Error: This file should not be sourced"
+		return 1
+fimd 'jq'
+
 	local mode=
 	while :; do
 		local options='save|restore'
@@ -35,8 +48,8 @@ main() {
 
 	local answer=
 	while :; do
-		read -re -p 'Choose directory to put temporary file: ' answer
-		if [[ $answer =~ [0-9]+ ]] && ((answer >= 0)) && ((answer < ${#options[@]})); then
+		read -re -p 'Choose directory for temporary files: ' answer
+		if [[ $answer =~ ^[0-9]+$ ]] && ((answer >= 0)) && ((answer < ${#options[@]})); then
 			break
 		fi
 	done
@@ -47,15 +60,12 @@ main() {
 		read -re -p 'Enter directory path: ' device_path
 	fi
 	device_path=${device_path%/}
-	local -A paths=(
-		[libreoffice]="$XDG_CONFIG_HOME/libreoffice/4/user"
-		[fonts]="$XDG_DATA_HOME/fonts"
-		[dbeaver]="$XDG_DATA_HOME/DBeaverData/workspace6/General/Scripts"
-		[ankiuserdata]="$XDG_DATA_HOME/Anki2/Default User"
-		[ankiaddons]="$XDG_DATA_HOME/Anki2/addons21"
-		[applicationsdir]="$HOME/Other/Application Data"
-		[devresources]="$HOME/.devresources"
-	)
+
+	local tmp_gnupg_dir=$(mktemp -d --suffix='-gnupg')
+	gpg --homedir "$tmp_gnupg_dir" --no-keyring --batch --yes --pinentry-mode loopback --passphrase-fd 3 --no-symkey-cache --decrypt "$device_path/_data/setup_private_sh.asc" 3<<<$(cat "$device_path/_data/pw.txt") | tar -xO > "$HOME/.dotfiles/config/setup-private.sh"
+
+	source ~/.dotfiles/config/setup.sh
+
 	local -A paths_encrypt=(
 		[gnupg]="$HOME/.gnupg"
 		[ssh]="$HOME/.ssh"
@@ -69,6 +79,15 @@ main() {
 		[setup_private_sh]="$HOME/.dotfiles/config/setup-private.sh"
 		[dotfiles_git_exclude]="$HOME/.dotfiles/.git/info/exclude"
 	)
+	local -A paths=(
+		[libreoffice]="$XDG_CONFIG_HOME/libreoffice/4/user"
+		[fonts]="$XDG_DATA_HOME/fonts"
+		[dbeaver]="$XDG_DATA_HOME/DBeaverData/workspace6/General/Scripts"
+		[ankiuserdata]="$XDG_DATA_HOME/Anki2/Default User"
+		[ankiaddons]="$XDG_DATA_HOME/Anki2/addons21"
+		[applicationsdir]="$HOME/Other/Application Data"
+		[devresources]="$HOME/.devresources"
+	)
 
 	if [ "$mode" = save ]; then
 		if [ "$device_path_is_manual" = true ]; then
@@ -79,7 +98,7 @@ main() {
 
 		local password= temp_gnupg=
 		password=$(LC_ALL=C tr -dc '[:graph:]' </dev/urandom | head -c 14)
-		temp_gnupg=$(mktemp -d --suffix '-gnupg')
+		temp_gnupg=$(mktemp -d --suffix='-gnupg')
 		mkdir -p "$temp_gnupg"
 		core.print_info "Password: $password"
 
@@ -112,7 +131,7 @@ main() {
 			cp -rT "$dir" "$dest"
 		done
 
-	elif [ "$mode" = restore ]; then
+	elif [ "$mode" = resto~/scripts/doctor.sh re ]; then
 		local password= pw_file="$device_path/_data/pw.txt"
 		if [ -f "$pw_file" ]; then
 			password=$(<"$pw_file")
@@ -122,7 +141,7 @@ main() {
 		fi
 
 		local temp_gnupg=
-		temp_gnupg=$(mktemp -d --suffix '-gnupg')
+		temp_gnupg=$(mktemp -d --suffix='-gnupg')
 
 		for name in "${!paths_encrypt[@]}"; do
 			local dir="${paths_encrypt[$name]}"
@@ -179,7 +198,7 @@ main() {
 		core.print_die "Invalid mode: $mode"
 	fi
 
-	core.print_info 'Done! You may need to remove the source directory'
+	core.print_info 'Done! You may want to remove $device_path/_data'
 }
 
 util.if_file_sourced || _main "$@"