diff --git a/files/etc/profile.d/startriver.sh b/files/etc/profile.d/startriver.sh
new file mode 100644
index 0000000..d2e1690
--- /dev/null
+++ b/files/etc/profile.d/startriver.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
+    exec river &> /tmp/river.log
+fi
diff --git a/files/usr/etc/skel/.config/river/init b/files/etc/skel/.config/river/init
similarity index 100%
rename from files/usr/etc/skel/.config/river/init
rename to files/etc/skel/.config/river/init
diff --git a/files/usr/share/fish/vendor_conf.d/brew.fish b/files/usr/share/fish/vendor_conf.d/brew.fish
deleted file mode 100644
index 7bb9497..0000000
--- a/files/usr/share/fish/vendor_conf.d/brew.fish
+++ /dev/null
@@ -1 +0,0 @@
-[ -d /home/linuxbrew/.linuxbrew ] && status --is-interactive && eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"
diff --git a/files/usr/share/fish/vendor_conf.d/startriver.fish b/files/usr/share/fish/vendor_conf.d/startriver.fish
deleted file mode 100644
index 06fb317..0000000
--- a/files/usr/share/fish/vendor_conf.d/startriver.fish
+++ /dev/null
@@ -1 +0,0 @@
-[ -z $DISPLAY ] && [ (tty) = /dev/tty1 ] && status --is-login && exec river &> /tmp/river.log