Updates to support latest Fedora

3 files changed, 37 insertions, 45 deletions

diff --git a/compile/age-plugin-yubikey.sh b/compile/age-plugin-yubikey.sh
new file mode 100755
index 0000000..e7da219
--- /dev/null
+++ b/compile/age-plugin-yubikey.sh
@@ -0,0 +1,18 @@
+#!/bin/sh
+# On Fedora...
+# sudo dnf install cargo pcsc-lite-devel
+if [ "$(id -u)" -eq 0 ] ; then
+	echo "Run as a regular user"
+	exit 1
+fi
+set -ex
+codedir="${CODEDIR:-$HOME/scm}"
+bindir="${BINDIR:-$HOME/.local/bin}"
+plugindir="${codedir}/age-plugin-yubikey"
+if ! [ -d "$plugindir" ] ; then
+	git clone https://github.com/str4d/age-plugin-yubikey "$plugindir"
+fi
+cd "$plugindir"
+cargo build
+cp -vf target/debug/age-plugin-yubikey $bindir
+cd -
diff --git a/compile/dpw.sh b/compile/dpw.sh
new file mode 100755
index 0000000..4509c81
--- /dev/null
+++ b/compile/dpw.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+# Not so much compiling, but fetching and installing, since it's a shell script...
+if [ "$(id -u)" -eq 0 ] ; then
+	echo "Run as a regular user"
+	exit 1
+fi
+set -ex
+codedir="${CODEDIR:-$HOME/scm}"
+dpwdir="${codedir}/dpw"
+if ! [ -d "$dpwdir" ] ; then
+	git clone https://git.riedstra.dev/mitch/dpw "$dpwdir"
+fi
+cd "$dpwdir"
+make PREFIX="$HOME/.local" install
+cd -
diff --git a/distro/fedora.sh b/distro/fedora.sh
index ce628ce..56b7d57 100755
--- a/distro/fedora.sh
+++ b/distro/fedora.sh
@@ -4,16 +4,16 @@ if [ "$(id -u)" -ne 0 ] ; then
 	exit 1
 fi
 set -ex
-PLYMOUTH=0
 
 yum -y update
 
-yum -y builddep dmenu slock st
+yum -y builddep dmenu slock st neovim
 yum -y install \
 	@development-tools \
 	@c-development \
 	NetworkManager-tui \
 	ShellCheck \
+	age \
 	ansible \
 	arandr \
 	bear \
@@ -39,10 +39,8 @@ yum -y install \
 	google-noto-emoji-fonts \
 	htop \
 	iperf3 \
-	java-1.8.0-openjdk \
-	java-1.8.0-openjdk-devel \
-	java-11-openjdk \
-	java-11-openjdk-devel \
+	java-21-openjdk \
+	java-21-openjdk-devel \
 	kpartx \
 	libXt-devel \
 	libfido2 \
@@ -55,7 +53,6 @@ yum -y install \
 	nload \
 	npm \
 	oksh \
-	oksh \
 	openssl \
 	pass \
 	pass-otp \
@@ -169,43 +166,5 @@ dnf -y config-manager addrepo --overwrite \
 	--from-repofile=https://brave-browser-rpm-release.s3.brave.com/brave-browser.repo
 dnf -y install brave-browser
 
-plymouth_changed=0
-case $PLYMOUTH in
-off|no|0)
-	fn="/etc/default/grub"
-	bak="$fn.$(date +%s)"
-	cp "$fn" "$bak"
-	if grep -q '^GRUB_CMDLINE_LINUX=.*rhgb quiet' "$fn"; then
-		plymouth_changed=1
-
-		sed -i -re's/^(GRUB_CMDLINE_LINUX=.*)rhgb quiet/\1/g' "$fn"
-		if diff -q "$fn" "$bak" >/dev/null ; then
-			rm "$bak"
-		fi
-	fi
-
-	echo 'omit_dracutmodules+=" plymouth "' > /etc/dracut.conf.d/01-no-plymouth.conf
-;;
-on|yes|1)
-	fn="/etc/default/grub"
-	bak="$fn.$(date +%s)"
-	cp "$fn" "$bak"
-	if ! grep -q '^GRUB_CMDLINE_LINUX=.*rhgb quiet' "$fn"; then
-		plymouth_changed=1
-
-		sed -i -re's/^(GRUB_CMDLINE_LINUX=.*)"/\1 rhgb quiet"/g' "$fn"
-		if diff -q "$fn" "$bak" >/dev/null ; then
-			rm "$bak"
-		fi
-	fi
-
-	rm /etc/dracut.conf.d/01-no-plymouth.conf || true
-;;
-esac
-if [ $plymouth_changed -eq 1 ] ; then
-	dracut -v -f
-	grub2-mkconfig -o /boot/grub2/grub.cfg
-fi
-
 # Prevent the stupid long startup times
 # akmods --kernels "$(ls -1t /usr/lib/modules | sed 1q | sed -e's@/$@@g')"