new wallpaper new me

Signed-off-by: Skylar "The Cobra" Widulski <cobra@vern.cc>

.bashrc

@@ -23,7 +23,7 @@ clear() {
 alias c='clear'
 alias ls='ls --color=auto -FAh'
 alias ll='ls -l'
-alias nf='neofetch'
+alias nf='hyfetch'
 alias ga='git add'
 alias gc='git commit -sS'
 alias gp='git push'
@@ -96,12 +96,62 @@ caption() {
 	local OUT="$2"
 	shift 2
 	local TEXT="$*"
-	local WIDTH="$(identify -format "%[w]" "$FILE")"
-	local HEIGHT="$(identify -format "%[h]" "$FILE")"
+	local WIDTH="$(identify -format "%[w]\n" "$FILE" | head -n1)"
+	local HEIGHT="$(identify -format "%[h]\n" "$FILE" | head -n1)"
 	local FONT_SIZE="$(((HEIGHT+WIDTH)/20))"
 	convert -gravity north \( -size "${WIDTH}x" -pointsize "$FONT_SIZE" -font 'Liberation-Sans-Bold' caption:"$TEXT" -gravity Center -extent "${WIDTH}x" \) "$FILE" -append "$OUT"
 }
 
+captionvid() {
+	[ -z "$3" ] && {
+		echo "Usage: captionvid [input] [output] [text...]"
+		return 1
+	}
+	rm /tmp/caption.*.png
+	FPS="$(ffmpeg -i "$1" 2>&1 |grep fps | sed 's/.* \([0-9]\+\) fps.*/\1/')"
+	IN="$1"
+	OUT="$2"
+	shift 2
+	ffmpeg -i "$IN" "/tmp/caption.%02d.png"
+	for i in /tmp/caption.*; do
+		caption "$i" "$i-new.png" "$*"
+	done
+	ffmpeg -framerate $FPS -i "/tmp/caption.%02d.png-new.png" "$OUT"
+	rm /tmp/caption.*.png
+}
+
+topbottom() {
+	[ -z "$3" ] && {
+		echo "Usage: caption [input] [output] [text...]"
+		return 1
+	}
+	local FILE="$1"
+	local OUT="$2"
+	shift 2
+	local WIDTH="$(identify -format "%[w]\n" "$FILE" | head -n1)"
+	local HEIGHT="$(identify -format "%[h]\n" "$FILE" | head -n1)"
+	local FONT_SIZE="$(((HEIGHT+WIDTH)/20))"
+	convert -size "${WIDTH}x" -stroke black -strokewidth 3 -fill white -pointsize "$FONT_SIZE" -font 'Liberation-Sans-Bold' -gravity Center -extent "${WIDTH}x" -gravity north \( -annotate +0+0 "$1" \) -gravity south \( -annotate +0+0 "$2" \) "$FILE" -append "$OUT"
+}
+
+topbottomvid() {
+	[ -z "$3" ] && {
+		echo "Usage: captionvid [input] [output] [text...]"
+		return 1
+	}
+	rm /tmp/caption.*.png
+	FPS="$(ffmpeg -i "$1" 2>&1 |grep fps | sed 's/.* \([0-9]\+\) fps.*/\1/')"
+	IN="$1"
+	OUT="$2"
+	shift 2
+	ffmpeg -i "$IN" "/tmp/caption.%02d.png"
+	for i in /tmp/caption.*; do
+		topbottom "$i" "$i-new.png" "$1" "$2"
+	done
+	ffmpeg -framerate $FPS -i "/tmp/caption.%02d.png-new.png" "$OUT"
+	rm /tmp/caption.*.png
+}
+
 subcipher() {
 	local COLOR PERM L1 line grep word
 	if [ $# -lt 3 ]; then
@@ -191,6 +241,21 @@ cpplot() {
 	ssh crescent "${1:-/opt/gnuplot/power/gnuplot.sh}; cat /opt/gnuplot/power/${1:-$(date -u -I)}.svg" > ${1:-$(date -u -I)}.svg
 }
 
-reconf () {
+reconf() {
 	$PRIV su - -c "guix system reconfigure /etc/${HOSTNAME,,}.scm"
 }
+
+geng() {
+	< "$1" sed 's/\s*;.*//' | grep -ve '^$' -e '^T' | awk '{print "N"NR" "$0}' > "$2"
+}
+
+mkmshex() {
+	FILE="${1%.*}"
+	microscheme "$1"
+	avr-gcc -B /run/current-system/profile/avr/lib/avr5 -mmcu="$2" -g -Os "$FILE".s -o "$FILE".elf
+	avr-objcopy -Oihex "$FILE".o "$FILE".hex
+}
+
+uploadhex() {
+	avrdude -C/run/current-system/profile/etc/avrdude.conf -v -p"$2" -carduino -P${3:-/dev/ttyS0} -U"flash:w:$1:i"
+}

.config/colorscheme

@@ -1,22 +1,23 @@
 #!/bin/sh
 foreground=e0e0e0
 background=000000
-regular0=222222  # black
-regular1=bf1541  # red
-regular2=55b750  # green
-regular3=b91f92  # yellow
-regular4=3436a7  # blue
-regular5=771cb7  # magenta
-regular6=1c81e6  # cyan
-regular7=d0d0d0  # white
-bright0=808080   # bright black
-bright1=f91b55   # bright red
-bright2=77dd77   # bright green
-bright3=da61c2   # bright yellow
-bright4=4456fa   # bright blue
-bright5=a63fc8   # bright magenta
-bright6=4a9be8   # bright cyan
-bright7=ffffff   # bright white
+regular0=2e2016  # black
+regular1=d88f96  # red
+regular2=16af38  # green
+regular3=dbbc2f  # yellow
+regular4=1961e6 # blue
+regular5=b3787e  # magenta
+regular6=32cbe6  # cyan
+regular7=f4e5e7  # white
+bright0=473032   # bright black
+bright1=e5a7aa   # bright red
+bright2=27d64d   # bright green
+bright3=f3d64d   # bright yellow
+bright4=4545db   # bright blue
+bright5=c6888d   # bright magenta
+bright6=67cbe6   # bright cyan
+bright7=fcf5f3   # bright white
+
 if [[ "$TERM" = "vt102" || "$TERM" = "linux" ]]; then
 	printf "\e]P$background\e]P1$regular1\e]P2$regular2\e]P3$regular3\e]P4$regular4\e]P5$regular5\e]P6$regular6\e]P7$foreground\e]P8$bright0\e]P9$bright1\e]PA$bright2\e]PB$bright3\e]PC$bright4\e]PD$bright5\e]PE$bright6\e]PF$bright7"
 fi

.config/foot/foot.ini

@@ -70,22 +70,22 @@ alpha=0.7
 
 foreground=e0e0e0
 background=000000
-regular0=222222  # black
-regular1=bf1541  # red
-regular2=55b750  # green
-regular3=b91f92  # yellow
-regular4=3436a7  # blue
-regular5=771cb7  # magenta
-regular6=1c81e6  # cyan
-regular7=d0d0d0  # white
-bright0=808080   # bright black
-bright1=f91b55   # bright red
-bright2=77dd77   # bright green
-bright3=da61c2   # bright yellow
-bright4=4456fa   # bright blue
-bright5=a63fc8   # bright magenta
-bright6=4a9be8   # bright cyan
-bright7=ffffff   # bright white
+regular0=2e2016  # black
+regular1=d88f96  # red
+regular2=16af38  # green
+regular3=dbbc2f  # yellow
+regular4=1961e6 # blue
+regular5=b3787e  # magenta
+regular6=32cbe6  # cyan
+regular7=f4e5e7  # white
+bright0=473032   # bright black
+bright1=e5a7aa   # bright red
+bright2=27d64d   # bright green
+bright3=f3d64d   # bright yellow
+bright4=4545db   # bright blue
+bright5=c6888d   # bright magenta
+bright6=67cbe6   # bright cyan
+bright7=fcf5f3   # bright white
 
 ## dimmed colors (see foot.ini(5) man page)
 # dim0=<not set>

.config/mpv/mpv.conf

@@ -5,3 +5,5 @@ user-agent="Mozilla/5.0"
 msg-level=ffmpeg=fatal
 vo=gpu
 hwdec=vaapi
+hwdec-codecs=all
+video-sync=display-resample

.config/sway/config

@@ -154,7 +154,22 @@ bindsym XF86AudioPlay exec playerctl play-pause
 bindsym XF86AudioNext exec playerctl next
 bindsym XF86AudioPrev exec playerctl previous
 
-bindsym XF86Launch1 exec ~/.local/bin/fss
+# Funny noises
+bindsym XF86Launch1 exec mpv ~/Audio/boom.opus
+bindsym KP_Enter exec mpv ~/Audio/metal-pipe.opus
+bindsym KP_0 exec mpv ~/Audio/running.opus
+bindsym KP_Decimal exec mpv ~/Audio/among-us.opus
+bindsym KP_Add exec mpv ~/Audio/wah-wah-wah-wah.opus
+bindsym KP_1 exec mpv ~/Audio/boowomp.opus
+bindsym KP_2 exec mpv ~/Audio/chomp.ogg
+bindsym KP_3 exec mpv ~/Audio/slip.opus
+bindsym KP_Subtract exec mpv ~/Audio/inception.opus
+bindsym KP_4 exec mpv ~/Audio/waltuh.opus
+bindsym KP_5 exec mpv ~/Audio/hallway.opus
+bindsym KP_6 exec mpv ~/Audio/bell.opus
+bindsym KP_Multiply exec mpv ~/Audio/lego.opus
+bindsym KP_7 exec mpv ~/Audio/mega.opus
+
 bindsym XF86ScreenSaver exec ~/.local/bin/lock
 bindsym Print exec ~/.local/bin/screenshot -w
 bindsym Pause exec ~/.local/bin/logout-wofi

.config/waybar/style.css

@@ -74,7 +74,7 @@
  * -------------------------------------------------------------------------- */
 
 #battery {
-    background-color: #4456fa;
+    background-color: #F79489;
     color: black;
     animation-timing-function: linear;
     animation-iteration-count: infinite;
@@ -113,7 +113,7 @@
 
 #cpu {
   /* No styles */
-    background-color: #da61c2;
+    background-color: #F9C6C0;
     color: black;
 }
 
@@ -131,7 +131,7 @@
     animation-timing-function: linear;
     animation-iteration-count: infinite;
     animation-direction: alternate;
-    background-color: #a63fc8;
+    background-color: #FADCD9;
     color: black;
 }
 
@@ -157,7 +157,7 @@
 
 #network {
     /* No styles */
-    background-color: #bf1541;
+    background-color: #F9F1F0;
     color: black;
     border-top-left-radius: 15px;
     border-bottom-left-radius: 15px;
@@ -177,7 +177,7 @@
 
 #temperature {
     /* No styles */
-    background-color: #4a9be8;
+    background-color: #F8AFA6;
     color: black;
 }
 
@@ -203,7 +203,7 @@
 }
 
 #workspaces button.focused {
-    background-color: #1c81e6;
+    background-color: #F79489;
 }
 
 #workspaces button.urgent {

.local/bin/lock

@@ -1,9 +1,9 @@
 #!/usr/bin/env bash
 if ! ps aux | grep -v grep | grep swaylock; then
-	if [[ $(playerctl status) != "Playing" ]]; then
-		swayidle -w timeout 600 'sudo ~/.local/bin/__suspend' &
-		SUSPEND=$!
-	fi
+#	if [[ $(playerctl status) != "Playing" ]]; then
+#		swayidle -w timeout 600 'sudo ~/.local/bin/__suspend' &
+#		SUSPEND=$!
+#	fi
 	swayidle -w timeout 15 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' &
 	SCREENOFF=$!
 	swaylock -eFKL -i ~/.config/sway/background.png --font "Fira Code"