From 989486d4655c01e9318c29514e19781f61dfd60c Mon Sep 17 00:00:00 2001
From: Noah Pederson <noah@packetlost.dev>
Date: Wed, 11 Feb 2026 12:59:51 -0600
Subject: [PATCH] Add scripts from aleister

---
 scripts/fix-ghostty-terminfo |  5 +++++
 scripts/nd                   | 13 +++++++++++++
 scripts/oclip                |  4 ++++
 scripts/resolve.rcsh         | 31 +++++++++++++++++++++++++++++++
 scripts/rust-rover           |  3 +++
 scripts/s                    | 12 ++++++++++++
 6 files changed, 68 insertions(+)
 create mode 100755 scripts/fix-ghostty-terminfo
 create mode 100755 scripts/nd
 create mode 100755 scripts/oclip
 create mode 100755 scripts/resolve.rcsh
 create mode 100755 scripts/rust-rover
 create mode 100755 scripts/s

diff --git a/scripts/fix-ghostty-terminfo b/scripts/fix-ghostty-terminfo
new file mode 100755
index 0000000..c9b7f78
--- /dev/null
+++ b/scripts/fix-ghostty-terminfo
@@ -0,0 +1,5 @@
+#/usr/bin/env rc
+
+host=$1
+
+infocmp -x | ssh $host -- tic -x -
diff --git a/scripts/nd b/scripts/nd
new file mode 100755
index 0000000..9254d52
--- /dev/null
+++ b/scripts/nd
@@ -0,0 +1,13 @@
+#!/usr/bin/env rc
+
+flag e +
+flag x +
+
+flake=.
+
+if(~ $1 --flake) {
+	flake=$2
+	shift 2
+}
+
+exec nix develop -c $SHELL -- $*
diff --git a/scripts/oclip b/scripts/oclip
new file mode 100755
index 0000000..917ac0c
--- /dev/null
+++ b/scripts/oclip
@@ -0,0 +1,4 @@
+#!/usr/bin/env rc
+flag e +
+data=`{base64 <[0=0]}
+printf '\033]52;c;%s\007' $"data
diff --git a/scripts/resolve.rcsh b/scripts/resolve.rcsh
new file mode 100755
index 0000000..f1bf586
--- /dev/null
+++ b/scripts/resolve.rcsh
@@ -0,0 +1,31 @@
+#!/usr/bin/env rc
+
+flag e +
+
+gitroot=`{git rev-parse --show-toplevel}
+
+if(~ $1 -x --debug) {
+	flag x +
+	shift
+}
+
+if(~ $* ()) {
+	conflicted=`{git ls-files -u $gitroot | cut -f2 | uniq}
+} else {
+	conflicted=$*
+}
+
+echo Conflicted files: $conflicted >[1=2]
+
+for (file in $conflicted) {
+	prompt=(Do you want to add $file to the index? (y/n): ' ')
+	echo Editing $file
+	# Edit the file
+	$EDITOR $file
+	# Prompt for if we want to add it
+	read -p $"prompt response; #"
+	if (~ $response y Y) {
+		git add $file
+	}
+}
+
diff --git a/scripts/rust-rover b/scripts/rust-rover
new file mode 100755
index 0000000..be6b9cf
--- /dev/null
+++ b/scripts/rust-rover
@@ -0,0 +1,3 @@
+#!/usr/bin/env rc
+
+open $HOME/Applications/RustRover.app/
diff --git a/scripts/s b/scripts/s
new file mode 100755
index 0000000..905039b
--- /dev/null
+++ b/scripts/s
@@ -0,0 +1,12 @@
+#!/usr/bin/env rc
+
+flag e +
+
+server=`{cat $home/.ssh/config | awk '/^ +Host / { print $2}' | fzf}
+
+if(~ $server ()) {
+	echo No server selected
+	exit 0
+}
+
+ssh $server $*
-- 
2.51.2