Minor changes to make things work with Fedora 43

3 files changed, 54 insertions, 41 deletions

diff --git a/fedora.sh b/fedora.sh
index 6670658..6a13a7e 100755
--- a/fedora.sh
+++ b/fedora.sh
@@ -1,39 +1,18 @@
 #!/bin/sh
 set -ex
-zigver=0.13.0
-zigdir="$HOME/scm/zig/zig$zigver"
-zigout="${zigdir}.tar.xz"
-zigurl="https://ziglang.org/download/$zigver/zig-linux-x86_64-$zigver.tar.xz"
-zigsigurl="${zigurl}.minisig"
-zigkey="RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U"
+./link.sh
+./bldSession.sh
 sudo yum -y install \
-	clang13-libs \
-	libevdev-devel \
-	lld13-libs \
-	llvm13-libs \
-	minisign \
-	scdoc \
-	wayland-protocols-devel \
-	wget \
-	wlroots \
-	wlroots-devel \
+	river \
 	xdg-desktop-portal-wlr \
-	xwayland-run
-mkdir -p "$(dirname "$zigdir")"
-cd "$(dirname "$zigdir")"
-if ! [ -d "$zigdir" ] ; then
-	wget -O "$zigout" "$zigurl"
-	wget -O "${zigout}.minisig" "$zigsigurl"
-	minisign -Vm "$zigout" -P "$zigkey"
-	mkdir "$zigdir"
-	cd -
-	cd "$zigdir"
-	tar --strip-components=1 -xJf "$zigout"
-fi
-export PATH="$zigdir:$PATH"
-cd -
-./bldRiver.sh
-sudo yum -y install foot bemenu waybar swaylock swaybg grim slurp wdisplays \
-	kanshi wlr-randr wtype
-./bldSession.sh
-./link.sh
+	foot \
+	bemenu \
+	waybar \
+	swaylock \
+	swaybg \
+	kanshi \
+	wlr-randr \
+	grim \
+	slurp \
+	wl-clipboard \
+	wtype
diff --git a/fedora39.sh b/fedora39.sh
new file mode 100755
index 0000000..6670658
--- /dev/null
+++ b/fedora39.sh
@@ -0,0 +1,39 @@
+#!/bin/sh
+set -ex
+zigver=0.13.0
+zigdir="$HOME/scm/zig/zig$zigver"
+zigout="${zigdir}.tar.xz"
+zigurl="https://ziglang.org/download/$zigver/zig-linux-x86_64-$zigver.tar.xz"
+zigsigurl="${zigurl}.minisig"
+zigkey="RWSGOq2NVecA2UPNdBUZykf1CCb147pkmdtYxgb3Ti+JO/wCYvhbAb/U"
+sudo yum -y install \
+	clang13-libs \
+	libevdev-devel \
+	lld13-libs \
+	llvm13-libs \
+	minisign \
+	scdoc \
+	wayland-protocols-devel \
+	wget \
+	wlroots \
+	wlroots-devel \
+	xdg-desktop-portal-wlr \
+	xwayland-run
+mkdir -p "$(dirname "$zigdir")"
+cd "$(dirname "$zigdir")"
+if ! [ -d "$zigdir" ] ; then
+	wget -O "$zigout" "$zigurl"
+	wget -O "${zigout}.minisig" "$zigsigurl"
+	minisign -Vm "$zigout" -P "$zigkey"
+	mkdir "$zigdir"
+	cd -
+	cd "$zigdir"
+	tar --strip-components=1 -xJf "$zigout"
+fi
+export PATH="$zigdir:$PATH"
+cd -
+./bldRiver.sh
+sudo yum -y install foot bemenu waybar swaylock swaybg grim slurp wdisplays \
+	kanshi wlr-randr wtype
+./bldSession.sh
+./link.sh
diff --git a/readme.md b/readme.md
index 3055c0f..9a4db33 100644
--- a/readme.md
+++ b/readme.md
@@ -11,12 +11,7 @@ Handled by kanshi, you get to configure that one.
   * My main [dotfiles](https://git.riedstra.dev/mitch/dotfiles/about/)  are installed.
   * Default shell is set to `oksh`. Bash and other shells probably work but are
     untested
-  * Fedora 39
-
-
-Ideally cloned down to `~/scm/wl/rivercfg`, where you can run `./fedora.sh`
-from the directory and it'll setup everything. This includes fetching the latest
-copy of Zig and compiling river from source code.
+  * Fedora or Arch linux
 
 Once the command finishes without error you should be able to select `wlcustom`
 from the login manager ( gdm, sddm, etc )