Merge remote-tracking branch 'origin/main'

common/fish/config.fish

@@ -59,8 +59,11 @@ end
 
 # If we're running the shell interactively from inside Kitty, assume that we will be using Kitty's multiplexing features
 # Otherwise, assume we're in a context that is not capable of "native" multiplexing features and run everything inside Zellij
-if set --query FISH_START_ZELLIJ
-  eval (zellij setup --generate-auto-start fish | string collect)
-else if set --query FISH_START_TMUX
+if not set --query ZELLIJ && set --query FISH_START_ZELLIJ && status is-interactive
+	# simulate auto attach
+  zellij attach -c
+	# simulate auto kill
+  kill $fish_pid
+else if not set --query TMUX && set --query FISH_START_TMUX && status is-interactive
 	tmux att -t default || tmux new -s default
 end

common/fish/prompt.fish

@@ -1,7 +1,12 @@
 set MAX_PATH_PIECE_CHARS 3
 
 function get_hostname
-	has_command hostname && hostname --short || cat /etc/hostname
+	if test (uname) = Linux || test (uname) = Darwin
+		has_command hostname && hostname --short || cat /etc/hostname
+	else
+		# assume bsd
+		hostname | head -n 1
+	end
 end
 
 function fish_greeting

os/linux/arch/provision.d/20-install-packages.bash

@@ -41,7 +41,8 @@ pacman -Sy --needed --noconfirm \
 	gnu-netcat socat websocat `# Socket Utilities` \
 	nnn `# CLI File Manager` \
 	avahi	nss-mdns `# mDNS and Network Discovery Utilities` \
-	dua-cli `# Disj Usage Abalyzer` \
+	git git-lfs `# Version Control` \
+	dua-cli `# Disk Usage Abalyzer` \
 	man-db man-pages `# Come On, Man!`
 
 # TODO: if paru? rtx-bin

os/linux/bin/batmon

@@ -0,0 +1,6 @@
+#!/usr/bin/env fish
+
+while true
+	echo (date +%s)' '(batteries-combined-wattage) >> ~/.battlog
+	sleep 5
+end

os/linux/bin/batteries-combined-wattage

@@ -0,0 +1,3 @@
+#!/usr/bin/env fish
+
+cat /sys/class/power_supply/BAT*/power_now | rg . | awk '{print $1*10^-6}' | awk '{sum+=$1}END{print sum}'

os/linux/bin/batteries-watts

@@ -0,0 +1,5 @@
+#!/usr/bin/env fish
+
+for b in /sys/class/power_supply/BAT*/power_now
+	cat $b | rg . | awk '{print $1*10^-6 " W"}'
+end

os/linux/bin/battplot

@@ -0,0 +1,9 @@
+#!/usr/bin/env fish
+echo '
+set xdata time
+set timefmt "%s"
+set format x "%H:%M:%S"
+# set yrange[0:96]
+while (1) { plot "/home/daniel/.home/.battlog" using 1:2 with linespoints
+pause 5 }
+' | gnuplot