From 495b8c110fd01425961f67a6600d163c4e4b11ce Mon Sep 17 00:00:00 2001
From: tosu <timo42@proton.me>
Date: Mon, 24 Jun 2024 18:12:32 +0200
Subject: [PATCH] Cleanups, export and importing bash functions

---
 .bashrc                       | 162 +++++++++++++++++++++-------------
 .config/nvim/lua/tosu/set.lua |  12 +--
 .local/bin/dquote_escape      |   9 +-
 .local/bin/path               |  10 ++-
 .local/bin/squote_escape      |   9 +-
 .local/sbin/backup_dir        |   2 +-
 .profile                      |  85 +++++++++++++++++-
 .xinitrc                      |   4 +-
 8 files changed, 206 insertions(+), 87 deletions(-)

diff --git a/.bashrc b/.bashrc
index bcf8404..c5acab9 100644
--- a/.bashrc
+++ b/.bashrc
@@ -7,12 +7,6 @@
 # Exit when noninteractive. This is more portable than checking PS1.
 [ "${-#*i}" = "${-}" ] && return
 
-######################## utils (posix) (thanks rwxrob) #########################
-_path_lookup () { type -P "${1-}" ; } # adapted for bash.
-_have_all () { while [ "${#}" -gt "0" ] ; do [ -x "$(_path_lookup "${1-}")" ] || return 1 ; shift ; done ; }
-_have () { _have_all "${1-}" ; }
-_source_if () { [ -f "${1-}" ] && [ -r "${1-}" ] && . "${1-}" ; }
-
 ###################### exit when already sourced (posix) #######################
 [ -n "${BASHRC_SOURCED}" ] && { log.err ".bashrc already sourced. Reset shell with 'exec bash [-l]' or start a new terminal." ; return 1 ; }
 BASHRC_SOURCED='1' # don't use export here, otherwise you can't start shells within shells
@@ -35,12 +29,51 @@ hash -r
 unalias -a
 unset -v POSIXLY_CORRECT
 
+#################################### utils #####################################
+# import_bash_functions () {
+# 	__func_str=
+# 	__func_name=
+# 	while IFS= read -r line ; do
+# 		case "${line}" in
+# 			BASH_FUNC_*"_PERCENT_PERCENT=() {  "*)
+# 				__func_str="$(printf %s "${line#BASH_FUNC_}" | sed -e 's/_PERCENT_PERCENT=/ /')"
+# 				__func_name="${line#BASH_FUNC_}"
+# 				__func_name="${__func_name%%_PERCENT_PERCENT=*}"
+# 				;;
+# 			"}BASH_FUNC_END")
+# 				eval "${__func_str}
+# }"
+# 				export -f -- "${__func_name}"
+# 				__func_str=
+# 				__func_name=
+# 				;;	
+# 			*)
+# 				if [ -n "${__func_str}" ] && [ -n "${__func_name}" ] ; then
+# 					__func_str="${__func_str}
+# ${line}"
+# 				fi
+# 			;;
+# 		esac
+# 	done << __ENV
+# $(env)
+# __ENV
+# 	unset -v __func_str __func_name
+# }
+
+# import_bash_functions
+
+__path_lookup () { type -P "${1-}" ; } && export -f __path_lookup # adapted for bash.
+__have_all () { while [ "${#}" -gt "0" ] ; do [ -x "$(__path_lookup "${1-}")" ] || return 1 ; shift ; done ; } && export -f __have_all
+__have () { __have_all "${1-}" ; } && export -f __have 
+__source_if () { [ -f "${1-}" ] && [ -r "${1-}" ] && . "${1-}" ; } && export -f __source_if 
+
+
 ####################### per session environment (posix) ########################
 set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' && exec 2>/dev/null
 [ -n "${DISPLAY-}" ] || log.warn 'DISPLAY not set'
 set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' && exec 2>/dev/tty
 
-BAT_THEME='gruvbox-dark' # BAT_THEME='gruvbox-light'
+BAT_THEME='gruvbox-dark' || BAT_THEME='gruvbox-light'
 GPG_TTY="$(tty)"
 
 if [ ! "${TERM-}" = "linux" ] ; then
@@ -55,12 +88,13 @@ if [ ! "${TERM-}" = "linux" ] ; then
 	__scope
 	unset -f __scope
 fi
+MANPAGER='less -X'
 
 # ensure exported
 export USER HOME PWD PATH LD_LIBRARY_PATH TERM LANG DISPLAY EDITOR VISUAL \
 	XDG_RUNTIME_DIR MAIL GOPATH SUDO_EDITOR SSH_AUTH_SOCK MANPAGER \
 	GIT_SSH_COMMAND GIT_CONFIG_GLOBAL GPG_TTY BAT_THEME _JAVA_AWT_WM_NONREPARENTING \
-	USER42 EMAIL42
+	USER42 EMAIL42 CDPATH
 
 ################################# bash options #################################
 shopt -s autocd
@@ -96,16 +130,16 @@ write_history () {
 } && trap 'write_history' EXIT
 
 ############################# vim aliases (posix) ##############################
-if _have nvim ; then
-	alias vi="$(_path_lookup nvim)"
-elif _have vim ; then
-	alias vi="$(_path_lookup vim)"
-elif _have nvi ; then
-	alias vi="$(_path_lookup nvi)"
-elif _have vi ; then
-	alias vi="$(_path_lookup vi)"
-elif _have nano ; then
-	alias vi="$(_path_lookup nano)"
+if __have nvim ; then
+	alias vi="$(__path_lookup nvim)"
+elif __have vim ; then
+	alias vi="$(__path_lookup vim)"
+elif __have nvi ; then
+	alias vi="$(__path_lookup nvi)"
+elif __have vi ; then
+	alias vi="$(__path_lookup vi)"
+elif __have nano ; then
+	alias vi="$(__path_lookup nano)"
 fi
 alias v='log.err use vi'
 alias vim='log.err use vi'
@@ -128,6 +162,7 @@ alias objdump='objdump --disassembler-color=extended-color -Mintel'
 alias dmesg='dmesg --color=auto --reltime --human --nopager --decode'
 alias sudo='sudo ' # trailing space means complete aliases
 alias watch='watch -tcn.1 ' # trailing space means complete aliases
+alias rm='rm -Iv'
 
 ########################## overwrite aliases (posix) ###########################
 alias make='compiledb make'
@@ -148,11 +183,11 @@ alias ipa='ip -br -color=auto a'
 alias xcopy='xsel --clipboard --input'
 alias xpaste='xsel --clipboard --output'
 alias paco='"${HOME-}/francinette/tester.sh"'
-alias pcker='nvim "${HOME-}/.config/nvim/lua/"*'
+alias pcker='vi "${HOME-}/.config/nvim/lua/"*'
 alias francinette='"${HOME-}/francinette/tester.sh"'
 alias q-dig='docker run --rm -it ghcr.io/natesales/q'
 alias q='duck'
-alias after='nvim "${HOME-}/.config/nvim/after/plugin"'
+alias after='vi "${HOME-}/.config/nvim/after/plugin"'
 alias dotconf='git --git-dir="${HOME-}/.dotfiles/" --work-tree="${HOME-}"'
 alias ll='\ls --width="${COLUMNS:-80}" --sort=time --time=mtime --color=auto --fu -bharZ1l'
 alias l='\ls --width="${COLUMNS:-80}" --sort=time --time=mtime --color=auto --time-style=long-iso -bharZ1l'
@@ -172,19 +207,19 @@ CDPATH="."\
 ################################## FUNCTIONS ###################################
 ################################# vix (posix) ##################################
 vix () {
-	_have vi || { log.err 'vi missing' ; exit 1 ; }
+	__have vi || { log.err 'vi missing' ; return 1 ; }
 
-	[ "${#}" -lt "1" ] && { log.info "Usage: vix FILE [VIM_ARGS...]" ; return 1 ; }
+	[ "${#}" -lt "1" ] && { log.info "Usage: vix FILE [[N]VI[M]_ARGS...]" ; return 1 ; }
 
 	file="${1-}"
 	shift
-	[ -e "${file}" ] && [ ! -f "${file}" ] && { log.err "File '${file}' exists and is not a regular file" ; return 2 ; }
+	[ -e "${file}" ] && [ ! -f "${file}" ] && { log.err "File '${file}' exists and is not a regular file" ; return 3 ; }
 	if [ ! -e "${file}" ] ; then
-		printf "#! /bin/sh -\n\n\n" > "${file}" || { log.err "Can't write to file '${file}'" ; return 3 ; }
+		printf "#! /bin/sh -\n\n\n" > "${file}" || { log.err "Can't write to file '${file}'" ; return 4 ; }
 		set -- "${@}" +3
 	fi
 	if [ ! -x "${file}" ] ; then
-		chmod +x "${file}" || { log.err "Can't chmod +x '${file}'" ; return 4 ; }
+		chmod +x "${file}" || { log.err "Can't chmod +x '${file}'" ; return 5 ; }
 	fi
 	vi "${@}" "${file}"
 }
@@ -195,14 +230,15 @@ cd () {
 	pwd="${PWD}"
 	1>/dev/null command cd - || return 1
 	1>/dev/null pushd "${pwd}" || return 1
+	l
 }
 
-############################## vimw (posix) ###############################
+################################# viw (posix) ##################################
 # Roughly equivalent to vi "$(which "$1")", but also allowing for args after $1
-vimw () {
-	_have vi || { log.err 'vi missing' ; exit 1 ; }
+viw () {
+	__have vi || { log.err 'vi missing' ; return 1 ; }
 
-	[ -z "${1-}" ] && { log.info "Usage: vimw FILE [VIM_ARGS...]" ; return 1 ; }
+	[ -z "${1-}" ] && { log.info "Usage: viw FILE [[N]VI[M]_ARGS...]" ; return 2 ; }
 
 	first="${1-}"
 	shift
@@ -214,12 +250,12 @@ vimw () {
 # Clears cache and removes orphans. Arguably dangerous.
 # Depends on iw, paru, pacman, rankmirrors, sudo, curl
 paruuu () {
-	_have iw || { log.err 'iw missing' ; exit 1 ; }
-	_have paru || { log.err 'paru missing' ; exit 2 ; }
-	_have pacman || { log.err 'pacman missing' ; exit 3 ; }
-	_have rankmirrors || { log.err 'rankmirrors missing' ; exit 4 ; }
-	_have sudo || { log.err 'sudo missing' ; exit 5 ; }
-	_have curl || { log.err 'curl missing' ; exit 6 ; }
+	__have iw || { log.err 'iw missing' ; exit 1 ; }
+	__have paru || { log.err 'paru missing' ; exit 2 ; }
+	__have pacman || { log.err 'pacman missing' ; exit 3 ; }
+	__have rankmirrors || { log.err 'rankmirrors missing' ; exit 4 ; }
+	__have sudo || { log.err 'sudo missing' ; exit 5 ; }
+	__have curl || { log.err 'curl missing' ; exit 6 ; }
 
 	printf 'Do system upgrade (Y) or exit (n): '
 	read -r choice
@@ -283,8 +319,8 @@ paruuu () {
 ################################ skill (posix) #################################
 # Depends on pgrep, ps
 skill () {
-	_have pgrep || { log.err 'pgrep missing' ; return 1 ; }
-	_have ps || { log.err 'ps missing' ; return 2 ; }
+	__have pgrep || { log.err 'pgrep missing' ; return 1 ; }
+	__have ps || { log.err 'ps missing' ; return 2 ; }
 
 	exit_status=0
 	while [ -n "${1-}" ] ; do
@@ -312,7 +348,7 @@ skill () {
 ############################# wpa_restart (posix) ##############################
 # Depends on wpa_supplicant
 wpa_restart () {
-	_have wpa_supplicant || { log.err 'wpa_supplicant missing' ; return 1 ; }
+	__have wpa_supplicant || { log.err 'wpa_supplicant missing' ; return 1 ; }
 
 	skill wpa_supplicant
 	sudo wpa_supplicant -B -i "${1:-wlan0}" -c /etc/wpa_supplicant/wpa_supplicant.conf
@@ -338,7 +374,7 @@ norminette () {
 	local vers
 	local newst
 
-	_have norminette || { log.err 'norminette missing' ; return 1 ; }
+	__have norminette || { log.err 'norminette missing' ; return 1 ; }
 
 	vers="$($(type -P norminette) -v | cut -d" " -f2)"
 	newst='3.3.55'
@@ -352,8 +388,8 @@ norminette () {
 ################################ __norm (posix) ################################
 # Depends on git, norminette
 __norm () {
-	_have git || { log.err 'git missing' ; return 1 ; }
-	_have norminette || { log.err 'norminette missing' ; return 2 ; }
+	__have git || { log.err 'git missing' ; return 1 ; }
+	__have norminette || { log.err 'norminette missing' ; return 2 ; }
 
 	__pwd="$(pwd -P)"
 	[ -n "${__pwd}" ] && [ -z "${__pwd##${HOME-}/42/42cursus/*}" ] || { return 1 ; }
@@ -369,8 +405,8 @@ ft_check () {
 	URL="${1-}"
 	DIR="/tmp/tmp_repo_$(date +%s)"
 
-	_have git || { log.err 'git missing' ; return 1 ; }
-	_have norminette || { log.err 'norminette missing' ; return 2 ; }
+	__have git || { log.err 'git missing' ; return 1 ; }
+	__have norminette || { log.err 'norminette missing' ; return 2 ; }
 
 	# If no URL, get it from current repo
 	if [ -z "${URL-}" ] ; then
@@ -398,8 +434,8 @@ clone42 () {
 	folder="${1-}"
 	repo_url="${2-}"
 
-	_have git || { log.err 'git missing' ; return 1 ; }
-	_have norminette || { log.err 'norminette missing' ; return 2 ; }
+	__have git || { log.err 'git missing' ; return 1 ; }
+	__have norminette || { log.err 'norminette missing' ; return 2 ; }
 
 	git clone --quiet "${repo_url}" "${folder}" && {
 		cd "${folder}"
@@ -475,7 +511,7 @@ else
 fi
 
 # Autoclear
-# If bash runs in posix mode, if should be `cut -c2-' instead
+# If bash runs in posix mode, if should be "cut -c2-" instead
 # PS0='$(clear -x ; printf "${PS1@P}" ; fc -nl -1 | cut -c3- ; printf "\n")'
 
 # Simplified *Bash* Prompt, e.g. for tty/system/linux console
@@ -498,30 +534,30 @@ aocload () {
 	local year
 	local day
 
-	_have curl || { log.err 'curl missing' ; exit 1 ; }
-	_have tmux || { log.err 'tmux missing' ; exit 2 ; }
-	_have git || { log.err 'git missing' ; exit 3 ; }
+	__have curl || { log.err 'curl missing' ; return 1 ; }
+	__have tmux || { log.err 'tmux missing' ; return 2 ; }
+	__have git || { log.err 'git missing' ; return 3 ; }
 
 	this_year="$(date "+%Y")"
 	this_day="$(date "+%d" | sed -e 's/^0//')"
 	if [ -n "${1-}" ] ; then
 		if [ -z "${2-}" ] ; then
 			printf '\033[31m%s\033[m\n' 'Expected one more parameter (day)'
-			return 1
+			return 4
 		fi
 		if [ -n "${3-}" ] ; then
 			printf '\033[31m%s\033[m\n' 'Expected exactly 2 parameters (year day)'
-			return 2
+			return 5
 		fi
 		year="${1-}"
 		day="${2-}"
 		if [ "${day}" -lt "1" -o "${day}" -gt "25" ] ; then
 			printf '\033[31m%s\033[m\n' 'Day not in range 1..25'
-			return 3
+			return 6
 		fi
 		if [ "${year}" -lt "2015" -o "${year}" -gt "${this_year}" ] ; then
 			printf '\033[31m%s\033[m\n' "Year not in range 2015..${this_year}"
-			return 4
+			return 7
 		fi
 	else
 		year="${this_year}"
@@ -529,8 +565,8 @@ aocload () {
 	fi
 	dir="${AOC_DIR}/${year}/${day}"
 
-	mkdir -p -- "${dir}" || return 5
-	cd -P -- "${dir}" || return 6
+	mkdir -p -- "${dir}" || return 8
+	cd -P -- "${dir}" || return 9
 	2>/dev/null 1>&2 git init "${AOC_DIR}" || true
 
 	. "${AOC_DIR}/.env"
@@ -591,27 +627,27 @@ aocload () {
 
 	chmod +x './solution.py'
 	tmux splitw -v -c "${dir}"
-	tmux send-keys "nvim '+normal gg0' './in.txt'" ENTER
+	tmux send-keys "vi '+normal gg0' './in.txt'" ENTER
 	tmux select-pane -l
-	tmux send-keys "nvim './solution.py'" ENTER
+	tmux send-keys "vi './solution.py'" ENTER
 }
 
 ############################## terminal settings ###############################
 tabs -4
 set -o emacs
-_have lesspipe && eval "$(SHELL=/bin/sh lesspipe)"
+__have lesspipe && eval "$(SHELL=/bin/sh lesspipe)"
 
 # Key Repeat/Delay Rate
-_have xset && 2>/dev/null xset r rate 200 60
-# _have kbdrate && sudo kbdrate --rate=30.0 --delay=250
+__have xset && 2>/dev/null xset r rate 200 60
+# __have kbdrate && sudo kbdrate --rate=30.0 --delay=250
 
 # Disable bell
-_have xset && 2>/dev/null xset -b
+__have xset && 2>/dev/null xset -b
 
 ################################# completions ##################################
-complete -F _command vimw
+complete -F _command viw
 complete -C backup_dir backup_dir
 complete -C backup_file backup_file
 
 ################################### sources ####################################
-_source_if "${HOME}/.userbashrc"
+__source_if "${HOME}/.userbashrc"
diff --git a/.config/nvim/lua/tosu/set.lua b/.config/nvim/lua/tosu/set.lua
index 9c07538..f29f245 100644
--- a/.config/nvim/lua/tosu/set.lua
+++ b/.config/nvim/lua/tosu/set.lua
@@ -43,9 +43,9 @@ vim.opt.updatetime = 50
 vim.opt.paste = false
 vim.opt.splitright = false
 
-vim.diagnostic.config({
-	virtual_lines = false,
-	virtual_text = false,
-	underline = false,
-	signs = true,
-})
+-- vim.diagnostic.config({
+-- 	virtual_lines = false,
+-- 	virtual_text = false,
+-- 	underline = false,
+-- 	signs = true,
+-- })
diff --git a/.local/bin/dquote_escape b/.local/bin/dquote_escape
index 9bdc5a3..abc2147 100755
--- a/.local/bin/dquote_escape
+++ b/.local/bin/dquote_escape
@@ -1,9 +1,10 @@
 #! /bin/sh -
 
-if [ -t 0 ] && [ -n "${1}" ]; then
-	while [ -n "${1}" ]; do
-		printf '%s\n' "${1}" | sed 's/\\/\\\\/g; s/"/"'"'"'"'"'"'"/g; s/^/"/; s/$/"/'
-		shift
+if [ "${#}" -gt "0" ] ; then
+	for arg ; do
+		printf "'"
+		printf '%s' "${arg}" | sed 's/\\/\\\\/g; s/"/"'"'"'"'"'"'"/g'
+		printf "'\n"
 	done
 else
 	sed 's/\\/\\\\/g; s/"/"'"'"'"'"'"'"/g; s/^/"/; s/$/"/'
diff --git a/.local/bin/path b/.local/bin/path
index d77ef31..94e1ee3 100755
--- a/.local/bin/path
+++ b/.local/bin/path
@@ -1,6 +1,6 @@
 #! /bin/sh -
-# POSIX-compliant shell script to print the PATH contents line by line,
-# without duplicated, in order, without empty lines.
+# POSIX-compliant shell script to print the PATH (or the variable expanded by pathvar)
+# contents line by line, without duplicated, in order, without empty lines.
 
 __arrvar="__arr_random_n8241vn81y39c"
 
@@ -18,14 +18,16 @@ in_list () {
 	return 1
 }
 
+[ -n "${1}" ] && pathvar="${1}" || pathvar="PATH"
+
 idx=0
-printf "%s\n" "$PATH" | sed "s/^:\+//; s/:\+$//; s/:\+/\n/g" | while IFS= read -r line; do
+printf "%s\n" "$(eval "printf %s "'"'"\$$pathvar"'"'"")" | sed "s/^:\+//; s/:\+$//; s/:\+/\n/g" | while IFS= read -r line; do
 	eval "unset ${__arrvar}_$idx"
 	idx="$((idx+1))"
 done
 
 idx=0
-printf "%s\n" "$PATH" | sed "s/^:\+//; s/:\+$//; s/:\+/\n/g" | while IFS= read -r line; do
+printf "%s\n" "$(eval "printf %s "'"'"\$$pathvar"'"'"")" | sed "s/^:\+//; s/:\+$//; s/:\+/\n/g" | while IFS= read -r line; do
 	line="$(printf %s "$line" | sed 's|/\+|/|g; s|/$||')"
 	in_list "$idx" "$line" && continue
 	printf "%s\n" "$line"
diff --git a/.local/bin/squote_escape b/.local/bin/squote_escape
index 4759b62..6c341fc 100755
--- a/.local/bin/squote_escape
+++ b/.local/bin/squote_escape
@@ -1,9 +1,10 @@
 #! /bin/sh -
 
-if [ -t 0 ] && [ -n "${1}" ]; then
-	while [ -n "${1}" ]; do
-		printf '%s\n' "${1}" | sed "s/'/'"'"'"'"'"'"'/g; s/^/'/; s/$/'/"
-		shift
+if [ "${#}" -gt "0" ] ; then
+	for arg ; do
+		printf "'"
+		printf '%s' "${arg}" | sed "s/'/'"'"'"'"'"'"'/g"
+		printf "'\n"
 	done
 else
 	sed "s/'/'"'"'"'"'"'"'/g; s/^/'/; s/$/'/"
diff --git a/.local/sbin/backup_dir b/.local/sbin/backup_dir
index 5b1da4e..a15907c 100755
--- a/.local/sbin/backup_dir
+++ b/.local/sbin/backup_dir
@@ -1,5 +1,5 @@
 #! /bin/sh -
-# Depends on GNU cp, log.err
+# Depends on GNU tar, log.err
 
 ############################### completion start ###############################
 options='--no-chattr --no-sudo'
diff --git a/.profile b/.profile
index faf5301..057e2dc 100644
--- a/.profile
+++ b/.profile
@@ -3,6 +3,85 @@
 
 # TODO: Make more general purpose, currently quite bashy
 
+################################ utils (posix) #################################
+_squote_escape () {
+	if [ "${#}" -gt "0" ] ; then
+		for arg ; do
+			printf "'"
+			printf '%s' "${arg}" | sed "s/'/'"'"'"'"'"'"'/g"
+			printf "'\n"
+		done
+	else
+		sed "s/'/'"'"'"'"'"'"'/g; s/^/'/; s/$/'/"
+	fi
+}
+
+############################# define_func (posix) ##############################
+define_func () {
+	[ "${#}" -ne "2" ] && { log.err "Usage: define-func _func_name FUNC_BODY_AS_STR" ; return 1 ; }
+
+	_func_name="${1}"
+	_func_body="${2}"
+	eval "${_func_name}=$(_squote_escape "${_func_body}")" || return 2
+	eval "${_func_name} () {  ${_func_body}
+}" || return 3
+	_export_bash_func "${_func_name}"
+}
+
+########################## _export_bash_func (posix) ###########################
+_export_bash_func () {
+	_func_name="${1-}"
+
+	[ "${#}" -ne "1" ] && { log.err "Usage: _export_bash_func _func_name" ; return 1 ; }
+
+	case "${_func_name}" in (*[!abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_]*|""|[0123456789]*) false;; esac ||
+		{ log.err "_export_bash_func: not a valid name: ${_func_name}"; return 2; }
+
+	[ -n "$(eval "printf %s "'"'"\${${_func_name}-}"'"')" ] || { log.err "_export_bash_func: not a function: ${_func_name}" ; return 3 ; }
+
+	_newline="$(printf '\n.')" && _newline="${_newline%.}"
+	BASH_FUNCTIONS="${BASH_FUNCTIONS:+${BASH_FUNCTIONS}${_newline}}${_func_name}"
+	# exec env "BASH_FUNC_${_func_name}%%=() {  ${_func_body}${_newline}}" "${0}"
+}
+
+##################### _prepare_bash_funcs_for_eval (posix) #####################
+_prepare_bash_funcs_for_eval () {
+	_env_args=
+	_newline="$(printf '\n.')" && _newline="${_newline%.}"
+	while IFS= read -r _func_name ; do
+		_func_body="$(eval "printf %s "'"'"\${${_func_name}-}"'"')"
+		_env_arg_raw="BASH_FUNC_${_func_name}%%=() {  ${_func_body}${_newline}}"
+		_env_arg_safe="BASH_FUNC_${_func_name}_PERCENT_PERCENT=() {  ${_func_body}${_newline}}BASH_FUNC_END"
+		_env_args="${_env_args} $(_squote_escape "${_env_arg_raw}") $(_squote_escape "${_env_arg_safe}")"
+	done <<- FUNCS
+		${BASH_FUNCTIONS}
+	FUNCS
+	printf %s "${_env_args}"
+}
+
+############################# _to_eval_str (posix) #############################
+_to_eval_str () {
+	_eval_args=
+	for _arg; do
+		_eval_args="${_eval_args} $(_squote_escape "${_arg}")"
+	done
+	printf %s "${_eval_args}"
+}
+
+_exec () {
+	eval exec env "$(_prepare_bash_funcs_for_eval)" "$(_to_eval_str "${@}")"
+}
+
+_run () {
+	eval env "$(_prepare_bash_funcs_for_eval)" "$(_to_eval_str "${@}")"
+}
+
+############################### define functions ###############################
+define_func __path_lookup 'type -P "${1-}"' && export -f __path_lookup # adapted for bash.
+define_func __have_all 'while [ "${#}" -gt "0" ] ; do [ -x "$(__path_lookup "${1-}")" ] || return 1 ; shift ; done' && export -f __have_all
+define_func __have '__have_all "${1-}"' && export -f __have 
+define_func __source_if '[ -f "${1-}" ] && [ -r "${1-}" ] && . "${1-}"' && export -f __source_if 
+
 # TODO: Create ~/.local/bin directory and add ~/.local/bin to PATH
 # Add some basic scripts, like log.log, etc.
 ############################ logging utils (posix) #############################
@@ -69,7 +148,7 @@ else
 	export EMAIL42="timo42@proton.me"
 	export MAIL="timo42@proton.me"
 	export GOPATH="${HOME}/go"
-	MANPAGER="nvim +Man!" # MANPAGER="less -X"
+	__have nvim && MANPAGER="vi +Man!" && MANPAGER="less -F -X"
 	export MANPAGER
 	export PATH
 	export LD_LIBRARY_PATH
@@ -246,11 +325,11 @@ else
 	[ -s "${NVM_DIR}/bash_completion" ] && . "${NVM_DIR}/bash_completion"
 
 	if ! set | grep -sq '^\(TMUX_PANE\|SSH_CONNECTION\)' ; then
-		! pidof -q startx && 1>/home/tosuman/.startx.log 2>&1 startx || log.warn "Not starting X again"
+		! pidof -q startx && 1>/home/tosuman/.startx.log 2>&1 _exec startx || log.warn "Not starting X again"
 	fi
 	log.info ".profile sourced"
 	export PROFILE_SOURCED='1'
 fi
 
 # if running bash
-[ -n "${BASH_VERSINFO}" ] && [ -f "${HOME}/.bashrc" ] && [ -r "${HOME}/.bashrc" ] && . "${HOME}/.bashrc"
+[ -n "${BASH_VERSINFO}" ] && [ -f "${HOME}/.bashrc" ] && [ -r "${HOME}/.bashrc" ] && _exec bash
diff --git a/.xinitrc b/.xinitrc
index df36c9e..2c31976 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -1,4 +1,4 @@
-#! /bin/bash --
+#! /bin/sh -
 # ex: set ts=4 sw=4 ft=sh
 
-exec /bin/bash "${HOME}/.bash_xinitrc"
+exec /bin/bash -- "${HOME}/.bash_xinitrc"