Add TBD.

facts/general/package.yml

@@ -2,7 +2,7 @@
 # Define program names for package builtin.
 # This file is for ALL systems and should not include UI components.
 
-- name: General | Facts | Packages | Shared Defaults
+- name: General | Facts | Package | Shared Defaults
   set_fact:
     sshfs: sshfs
     tar: tar
@@ -12,7 +12,7 @@
     dig: dig
     neofetch: neofetch
 
-- name: General | Facts | Packages | Parrot OS Fixes
+- name: General | Facts | Package | Parrot OS Fixes
   set_fact:
     ansible_pkg_mgr: "apt"
     ansible_python_interpreter: "/usr/bin/python3"
@@ -56,10 +56,15 @@
     encfs: fusefs-encfs
   when: ansible_system == "FreeBSD"
 
+- name: General | Facts | Package | dnf (Fixes) # TBD: Fix + test package names: mlocate, dig, neofetch
+  set_fact:
+    ansible_pkg_mgr: dnf
+  when: ansible_pkg_mgr in ("dnf5")
+
 - name: General | Facts | Package | dnf
   set_fact:
     sshfs: fuse-sshfs
-    locate: mlocate
+    locate: plocate
     opensshd: openssh
     microcode_amd: microcode_ctl
     microcode_intel: microcode_ctl

files/dwm/config.h

@@ -104,7 +104,11 @@ static Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 // Mine
 	{ MODKEY,                       XK_q,      killclient,     {0} },
-// Volume (https://varunbpatil.github.io/2013/09/28/dwm.html) 
+	// extra search shortcut
+	{ MODKEY,                       XK_s,      spawn,          {.v = dmenucmd } },
+	// fullscreen shortcut for m	onocle
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[2]} },
+// Volume (https://varunbpatil.github.io/2013/09/28/dwm.html)
     { 0,                            0x1008ff12,spawn,          {.v = mutecmd } },
     { 0,                            0x1008ff11,spawn,          {.v = lowervolcmd } },
     { 0,                            0x1008ff13,spawn,          {.v = raisevolcmd } },

files/dwm/dwm-status.function

@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+# 2025-11-10 Hyperling
+# Icons: https://fontawesome.com/v4/cheatsheet/
+
+source "`which status.function`"
+
+function dwm-status {
+	status-display --dwm
+}

files/dwm/dwm.sh

@@ -5,17 +5,17 @@
 ## Load System Libs ##
 
 if [ -d /etc/X11/xinit/xinitrc.d ]; then
-  for f in /etc/X11/xinit/xinitrc.d/*; do
+	for f in /etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
+		[ -x "$f" ] && . "$f"
-  done
+	done
-  unset f
+	unset f
 fi
 
 if [ -d /usr/local/etc/X11/xinit/xinitrc.d ]; then
-  for f in /usr/local/etc/X11/xinit/xinitrc.d/*; do
+	for f in /usr/local/etc/X11/xinit/xinitrc.d/*; do
-    [ -x "$f" ] && . "$f"
+		[ -x "$f" ] && . "$f"
-  done
+	done
-  unset f
+	unset f
 fi
 
 
@@ -34,10 +34,9 @@ xsetroot -solid "$purple"
 # slstatus, from Suckless #
 #exec slstatus &
 
-# Custom #
+# Custom Setup #
-while true; do
+source "`which dwm-status.function`"
-  xsetroot -name "`whoami`@`hostname` `date +"%Y-%m-%d %H:%M:%S"`"
+dwm-status &
-done &
 
 
 ## Start ##

files/functions/battery.function

@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+# 2025-11-10 Hyperling
+
+function battery-display {
+	detailed="N"
+	if [[ -n $1 ]]; then
+		detailed="Y"
+	fi
+
+	if [[ "$detailed" == "Y" ]]; then
+		upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | grep -o "[0-9.%]*"
+	else
+		int="`upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep percentage | grep -o "[0-9]*" | head -n 1`"
+		echo "${int}%"
+	fi
+}
+alias show-battery="battery-display"
+alias battery="battery-display"
+alias battery-use="battery-display"
+alias battery-usage="battery-display"
+alias battery-level="battery-display"
+alias battery-levels="battery-display"

files/functions/cpu.function

@@ -0,0 +1,3 @@
+#/usr/local/bin env
+
+# TBD/TODO

files/functions/memory.function

@@ -0,0 +1,3 @@
+#/usr/local/bin env
+
+# TBD/TODO

files/functions/status.function

@@ -0,0 +1,85 @@
+#!/usr/bin/env bash
+# 2025-11-10 Hyperling
+# Icons: https://fontawesome.com/v4/cheatsheet/
+
+source "`which volume.function`"
+source "`which battery.function`"
+source "`which storage.function`"
+
+function datetime {
+	date +"%Y-%m-%d %H:%M:%S"
+}
+function status-display {
+	# Defaults
+	cmd="echo"
+	sleep=0.2
+	if [[ "`storage-root`" == "`storage-home`" ]]; then
+		function status-display-storage {
+			echo "`storage-root`"
+		}
+	else
+		function status-display-storage {
+			echo "Root (`storage-root`), Home (`storage-home`)"
+		}
+	fi
+
+	# Test Config
+	if [[ $1 == "-t" || $1 == "--test" || $1 == "test" ]]; then
+		sleep=5
+	fi
+
+	# DWM Config
+	if [[ $1 == "-d" || $1 == "--dwm" || $1 == "dwm" ]]; then
+		cmd="xsetroot -name"
+		if [[ "`storage-root`" == "`storage-home`" ]]; then
+			function status-display-storage {
+				echo "`storage-root-dwm`)"
+			}
+		else
+			function status-display-storage {
+				echo "(Root `storage-root-dwm`, Home `storage-home-dwm`)"
+			}
+		fi
+	fi
+	battery=""; storage=""; volume=""; datetime="";
+	userhost="`whoami`@`hostname`"
+	while true; do
+		# Exit if parent process is gone.
+		#TBD/TODO
+
+		# Reset Variables
+		if [[ $datetime == *"00" ]]; then
+			unset battery
+			unset storage
+		fi
+		if [[ $datetime != "`datetime`" ]]; then
+			unset volume
+			unset datetime
+		fi
+
+		# Set Variables
+		if [[ -z $battery ]]; then
+			battery="`battery-display`"
+		fi
+		if [[ -z $storage ]]; then
+			storage="`status-display-storage`"
+		fi
+		if [[ -z $volume ]]; then
+			volume="`volume-display`"
+		fi
+		if [[ -z $datetime ]]; then
+			datetime="`datetime`"
+		fi
+
+		# Display Variables
+		readout="$readout  $battery"
+		readout="$readout |  $storage"
+		readout="$readout |  $volume"
+		readout="$readout |  $userhost"
+		readout="$readout |  $datetime"
+		$cmd "$readout"
+		readout=""
+		sleep $sleep
+	done
+}
+alias status="status-display --test"

files/functions/storage.function

@@ -0,0 +1,38 @@
+#!/usr/bin/env bash
+# 2025-11-10 Hyperling
+
+function storage-display {
+	location="$1"
+	style="$2"
+
+	if [[ -z "$location" ]]; then
+		echo "ERROR: Location must be passed. $location"
+	fi
+
+	if [[ "$style" == "%" || "$style" == "pct" || "$style" == "percent" ]]; then
+		df -h "$location" | tail -n 1 | awk '{print $5" Used"}'
+	elif [[ "$style" == "/" || "$style" == "use" || "$style" == "usage" ]]; then
+		df -h "$location" | tail -n 1 | awk '{print $4"/"$2" Free"}'
+	elif [[ "$style" == "G" || "$style" == "S" || "$style" == "F" ]]; then
+		df -h "$location" | tail -n 1 | awk '{print $4" Free"}'
+	else
+		df -h "$location" | tail -n 1 | awk '{print $5" Used - "$4"/"$2" Free"}'
+	fi
+}
+alias storage='echo -n "Root: " && storage-display "/" "F" && echo -n "Home: " && storage-display "/home" "F"'
+
+export dwm_storage_style="F"
+
+function storage-root {
+	storage-display / "$1"
+}
+function storage-root-dwm {
+	storage-root "$dwm_storage_style"
+}
+
+function storage-home {
+	storage-display /home "$1"
+}
+function storage-home-dwm {
+	storage-home "$dwm_storage_style"
+}

files/functions/swap.function

@@ -0,0 +1,3 @@
+#/usr/local/bin env
+
+# TBD/TODO

files/functions/volume.function

@@ -0,0 +1,173 @@
+#!/usr/bin/env bash
+# 2025-11-10 Hyperling
+# Volume management for systems without working volume buttons.
+# Written for ease of use in terminal and simple window management systems.
+
+function volume-usage {
+	cat <<- EOF
+		Usage: volume [%int] [(+/-)%int] [-d] [-r] [-t] [-h]
+
+		Set to a static value:
+		    volume 100, volume 65
+
+		Increment or decrement. Passing only + or - and no number defaults to 5.
+		    volume -5, volume 5-, volume - 5, volume 5 -
+		    volume +20, volume 20+, volume + 20, volume 20 +
+
+		Display the current volume:
+		    volume,
+		    volume-display, volume display, volume --display, volume -d,
+		    volume +d
+
+		Set volume to a random number between 0 and 100.
+		    volume-random, volume random, volume --random, volume -r
+
+		Be silly and oscillate volume in a loop:
+		    volume-trip, volume trip, volume --trip, volume -t
+
+		Display this help text:
+		    volume-usage,
+		    volume-help volume help, volume --help, volume -h
+	EOF
+	return $1
+}
+alias volume-help="volume-usage"
+alias vol-h="volume-help"
+
+function volume {
+
+	## Check Params ##
+
+	if [[ "$1" == "--help" || "$1" == "help" || "$1" == "-h" ]]; then
+		volume-usage 1
+		return 1
+	fi
+	if [[ (-z "$1" && -z "$2")
+	|| "$1" == "--display" || "$1" == "display" || "$1" == "-d" || "$1" == "+d"
+	]]; then
+		volume-display
+		return 0
+	fi
+
+	## Parse Params ##
+
+	dir=""
+	amt=""
+
+	# Remove percent signs.
+	if [[ "$1" == *"%"* || "$2" == *"%"* ]]; then
+		set -- "${1//%/}" "${2//%/}"
+	fi
+
+	# Check if format is written text.
+	if [[ "$1" == "full" || "$1" == "max" ]]; then
+		amt=100
+	fi
+	if [[ "$1" == "mute" || "$1" == "none" ]]; then
+		amt=0
+	fi
+
+	# Check if the format is "volume +/- %int"
+	if [[ -z "$amt" && -z "$dir" ]]; then
+		if [[ "$1" == "+" || "$1" == "-" ]]; then
+			dir="$1"
+			amt="$2"
+			if [[ -z "$2" ]]; then
+				amt="5"
+			else
+				amt="$2"
+			fi
+		fi
+	fi
+
+	# Check if the format is "volume +/- %int".
+	if [[ -z "$amt" && -z "$dir" ]]; then
+		if [[ "$2" == "+" || "$2" == "-" ]]; then
+			amt="$1"
+			dir="$2"
+		fi
+	fi
+
+	# Check if amount and direction are adjacent, and if so, pull the values.
+	if [[ -z "$amt" && -z "$dir" ]]; then
+		if [[ "$1" == *"+"* ]]; then
+			dir="+"
+		elif [[ "$1" == *"-"* ]]; then
+			dir="-"
+		fi
+		if [[ -n "$dir" && -z "$amt" ]]; then
+			amt="$1"
+			amt=${amt//-/}
+			amt=${amt//+/}
+		fi
+	fi
+
+	# Check if format is direct volume.
+	if [[ -z "$dir" && -z "$amt" && -n "$1" && -z "$2" ]]; then
+		amt="$1"
+	fi
+
+	## Error Checking ##
+	regex='^[0-9]+$'
+	if ! [[ $amt =~ $regex ]]; then
+		echo "> ERROR: Amount '$amt' does not seem like a integer."
+		volume-usage 2
+		return 2
+	fi
+
+	## Main ##
+
+	if [[ -n "$dir" && -n "$amt" ]]; then
+		echo "> Changing volume by '$dir$amt%'."
+		amixer -q sset Master ${amt}%${dir}
+		echo "> Volume is now '`volume-display`'."
+		return 0
+	fi
+
+	if [[ -z "$dir" && -n "$1" ]]; then
+		echo "> Setting volume to '$amt'."
+		amixer -q sset Master ${amt}%
+		echo "> Volume has been set to '`volume-display`'."
+		return 0
+	fi
+
+	echo "> ERROR: Should not have made it here. Please report this to the developer."
+	echo "$0 $1 $2"
+	return 7
+}
+alias vol="volume "
+alias vol-="volume - "
+alias vol+="volume + "
+
+function volume-display {
+	if [[ "$1" == "-v" || "$1" == "--verbose" || "$1" == "verbose" ]]; then
+		amixer sget Master
+	else
+		amixer sget Master | egrep -o '[0-9]{1,3}%' | head -n 1
+	fi
+}
+alias "vol-d"="volume-display"
+
+## TBD/TODO ##
+
+# Go up and down until cancelled.
+#function volume-trip {
+#	curr eq amixer current readout
+#	if curr lt 50 then dir eq + else dir eq -
+#	while true; do
+#		if vol is 0 then dir eq +
+#		if vol is 100 then dir eq -
+#		curr eq \$curr $dir 1
+#		amixer set volume to curr
+#		sleep 0.1
+#	done
+#}
+#alias vol-t="volume-trip"
+#alias volume-wub="volume-trip"
+#alias vol-w="volume-wub"
+
+#function volume-random {
+#	v eq $RANDOM % 101
+#	amixer set volume eq v
+#}
+#alias vol-r="volume-random"

files/functions/vpn.function

@@ -0,0 +1,3 @@
+#/usr/local/bin env
+
+# TBD/TODO

files/functions/wifi.function

@@ -0,0 +1,3 @@
+#/usr/local/bin env
+
+# TBD/TODO

setup.sh

@@ -9,13 +9,18 @@ LOCAL=$DIR/local.yml
 URL="https://git.hyperling.com/me/env-ansible"
 BRANCH="main"
 
+config_dir="/usr/local/etc/hyperling-scm"
+general_config="$config_dir/general.ini"
+workstation_config="$config_dir/workstation.ini"
+server_config="$config_dir/server.ini"
+
 ## Functions ##
 
 # Accepts 1 parameter, it is used as the exit status.
 function usage {
 	cat <<- EOF
 
-	  $PROG [-l] [-b branch_name] [-g] [-w] [-s] [-h]
+	  $PROG [-l] [-b branch_name] [-g] [-w] [-s] [-f] [-h]
 	    Program to initialize synchronization with Hyperling's Ansible configuration.
 	      $URL
 
@@ -24,10 +29,11 @@ function usage {
 	             This is helpful for development or just saving bandwidth.
 	             It also provides prettier colors than the plaintext from ansible-pull. ;)
 	      -b branch_name : Download and run a specific branch. Default is $BRANCH.
-			-g : Enable the General config with test contents.
+	      -g : Enable the General config with test contents.
-			-w : Enable the Workstation config with test contents.
+	      -w : Enable the Workstation config with test contents.
-			-s : Enable the Server config with test contents.
+	      -s : Enable the Server config with test contents.
-	      -h : Display this help text
+			-f : Display this system's facts.
+	      -h : Display this help text.
 
 	EOF
 	exit $1
@@ -35,13 +41,14 @@ function usage {
 
 ## Parameter Parsing ##
 
-while getopts ":lb:gwsh" arg; do
+while getopts ":lb:gwsfh" arg; do
 	case $arg in
 		l) local="Y" && echo "Running $LOCAL as the playbook." ;;
 		b) branch="$OPTARG" && echo "Using branch $branch instead of $BRANCH." ;;
-		l) create_general="Y" && echo "Creating basic '$general_config'." ;;
+		g) create_general="Y" && echo "Requested '$general_config'." ;;
-		l) create_workstation="Y" && echo "Creating basic '$workstation_config'." ;;
+		w) create_workstation="Y" && echo "Requested '$workstation_config'." ;;
-		l) create_server="Y" && echo "Creating basic '$server_config'." ;;
+		s) create_server="Y" && echo "Requested '$server_config'." ;;
+		f) show_facts="Y" ;;
 		h) usage ;;
 		*) echo "ERROR: Parameter $OPTARG was not recognized." && usage 1 ;;
 	esac
@@ -120,43 +127,69 @@ if [[ `which ansible > /dev/null; echo $?` != 0 ]]; then
 fi
 echo "Installed!"
 
+if [[ "$show_facts" == "Y" ]]; then
+	echo "Showing Ansible Facts"
+	ansible localhost -m setup --connection=local
+fi
+
 #echo "Adding Ansible Collections..."
 #ansible-galaxy collection install community.general
 #echo "Added!"
 
 # Create basic layouts if configs do not exist and are requested.
+
+if [[ -n "$create_general"
+	|| -n "$create_workstation"
+	|| -n "$create_server" ]]
+then
+	sudo mkdir -pv "$config_dir"
+	MARK1="BEGIN"
+	MARK2="END"
+fi
 if [[ -n "$create_general" && ! -f "$general_config" ]]; then
 	function print_general_contents {
 		cat <<- EOF
+			; $MARK1 MANAGED BY ANSIBLE | Generic Config
+			; $MARK2 MANAGED BY ANSIBLE | Generic Config
+			; TEST DATA
 			enable=true
 			user=test
 			user_desc=Test
 			branch=$branch
+			; TEST DATA
 		EOF
 	}
-	print_general_contents > "$general_config"
+	print_general_contents | sudo tee "$general_config"
+	ls -lh "$general_config"
 fi
 if [[ -n "$create_workstation" && ! -f "$workstation_config" ]]; then
 	function print_workstation_contents {
 		cat <<- EOF
+			; $MARK1 MANAGED BY ANSIBLE | Workstation Config
+			; $MARK2 MANAGED BY ANSIBLE | Workstation Config
+			; TEST DATA
 			enable=true
-			user=test
+			coding=true
-			user_desc=Test
+			editing=false
-			branch=$branch
+			gaming=false
+			; TEST DATA
 		EOF
 	}
-	print_workstation_contents > "$workstation_config"
+	print_workstation_contents | sudo tee "$workstation_config"
+	ls -lh "$workstation_config"
 fi
 if [[ -n "$create_server" && ! -f "$server_config" ]]; then
 	function print_server_contents {
 		cat <<- EOF
+			; $MARK1 MANAGED BY ANSIBLE | Server Config
+			; $MARK2 MANAGED BY ANSIBLE | Server Config
+			; TEST DATA
 			enable=true
-			user=test
+			; TEST DATA
-			user_desc=Test
-			branch=$branch
 		EOF
 	}
-	print_server_contents > "$server_config"
+	print_server_contents | sudo tee "$server_config"
+	ls -lh "$server_config"
 fi
 
 echo "Provisioning Ansible..."

tasks/general/acct_mgmt/provision_config.yml

@@ -26,7 +26,7 @@
   blockinfile:
     path: "{{ gen_file }}"
     block: |
-      ; Please note that all potions require lowercase keys and values.
+      ; Please note that all portions require lowercase keys and values.
       ;
       ;;;;;;;;;;;;;;;;;;;;          Basic Options           ;;;;;;;;;;;;;;;;;;;;
       ;

tasks/general/acct_mgmt/users.yml

@@ -1013,6 +1013,17 @@
       alias shell-reload="reload-bash"
       alias reload-shell="reload-bash"
       alias reload="reload-bash"
+    alias_hugo_server: |
+      alias hugo-server-dev="hugo server -D --gc --ignoreCache --noHTTPCache --disableFastRender"
+      alias hugo-server-stage="hugo server --gc --noHTTPCache --disableFastRender"
+      alias hugo-server-prod="hugo server --gc --minify"
+      alias hugo-server="hugo-server-dev"
+    global_functions: |
+      for global_function in "{{ global_bin }}/"*".function"; do
+        if [[ -f "$global_function" ]]; then
+          . "$global_function"
+        fi
+      done
 
 - name: General | Account Management | Users | Files | Common Variable
   set_fact:
@@ -1091,6 +1102,8 @@
       {{ alias_sudo }}
       {{ function_load_branch }}
       {{ alias_reload_bash }}
+      {{ alias_hugo_server }}
+      {{ global_functions }}
 
 - name: General | Account Management | Users | Files | .bashrc
   blockinfile:
@@ -1160,3 +1173,17 @@
     - .bashrc
     - .zshrc
     - .vimrc
+
+
+- name: General | Account Management | Users | Files | Helper Functions (Reset)
+  shell: "rm -v {{ global_bin }}/*.function"
+
+- name: General | Account Management | Users | Files | Helper Functions
+  copy:
+    src: "{{ item }}"
+    dest: "{{ global_bin }}"
+    owner: root
+    group: "{{ root_group }}"
+    mode: 0755
+  with_fileglob:
+    - "functions/*.function"

tasks/workstation/shared/settings/gnome.yml

@@ -23,6 +23,7 @@
                       , 'io.lbry.lbry-app.desktop', 'lbry.desktop'
                       , 'com.valvesoftware.Steam.desktop'
                       , 'net.lutris.Lutris.desktop'
+                      , 'mullvad-vpn.desktop'
                       ]"
     dconf_terminal: gnome-terminal
     dconf_theme: Adwaita-dark

tasks/workstation/shared/software/dwm.yml

@@ -3,7 +3,7 @@
 # https://dwm.suckless.org/
 # https://sites.google.com/site/lazyboxx/-articles/dwm-a-newbie-s-guide#TOC-Status-Bar
 
-#TODO: Move this to tasks/shared/ pasth rather than tasks/linux/.
+#TODO: Move this to tasks/shared/ path rather than tasks/linux/.
 #TODO: Generate files based on blockinfile.
 #TODO: Fix config.mk for FreeBSD automatically (use /usr/local/ for libs not /usr/X11RC/)
 #TODO: scm.sh to use bash variable so that FreeBSD correctly hits /usr/local/bin/bash.
@@ -23,14 +23,14 @@
 ## Download ##
 
 - name: Workstation | Linux | Software | DWM | Git Clone
-  git: 
+  git:
     repo: https://git.suckless.org/dwm
     dest: "{{ dwm_install_dir }}"
     clone: yes
     force: yes
 
 - name: Workstation | Linux | Software | DWM | Git Clone (st)
-  git: 
+  git:
     repo: https://git.suckless.org/st
     dest: "{{ st_install_dir }}"
     clone: yes
@@ -78,3 +78,16 @@
     owner: root
     group: "{{ root_group }}"
     mode: 0644
+
+
+## Status Bar ##
+
+- name: Workstation | Linux | Software | DWM | Status Bar Function
+  copy:
+    src: "{{ item }}"
+    dest: "{{ global_bin }}"
+    owner: root
+    group: "{{ root_group }}"
+    mode: 0755
+  with_fileglob:
+    - "dwm/*.function"