diff --git a/build.sh b/build.sh
index 3e3bbcf..e1653d8 100755
--- a/build.sh
+++ b/build.sh
@@ -17,24 +17,10 @@ curl -Lo /etc/yum.repos.d/ganto-lxc4-fedora-"${FEDORA_MAJOR_VERSION}".repo https
 curl -Lo /etc/yum.repos.d/_copr_che-nerd-fonts-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/fedora-"${FEDORA_MAJOR_VERSION}"/che-nerd-fonts-fedora-"${FEDORA_MAJOR_VERSION}".repo
 
 curl -Lo /etc/yum.repos.d/_copr_babariviere-tools-"${FEDORA_MAJOR_VERSION}".repo https://copr.fedorainfracloud.org/coprs/babariviere/tools/repo/fedora-"${FEDORA_MAJOR_VERSION}"/babariviere-tools-fedora-"${FEDORA_MAJOR_VERSION}".repo
-
-curl https://downloads.1password.com/linux/keys/1password.asc | tee /etc/pki/rpm-gpg/1password.gpg
-
-### Install 1password using blue-build script
-
-wget -O 1password.sh https://raw.githubusercontent.com/blue-build/modules/22fe11d844763bf30bd83028970b975676fe7beb/modules/bling/installers/1password.sh
-
-chmod +x 1password.sh
-bash ./1password.sh
-
-rm 1password.sh
-
 ### Install packages
 
 grep -v '^#' /tmp/packages | xargs rpm-ostree install
 
-rpm-ostree install 1password
-
 rpm-ostree override remove opensc
 
 
@@ -51,6 +37,7 @@ systemctl enable podman.socket
 systemctl enable tailscaled.service
 systemctl enable -f --global flatpak-setup.service
 systemctl enable -f --global azure-topgrade.service
+systemctl enable -f --global emacs.service
 
 systemctl enable azure-system-setup.service
 systemctl enable azure-groups.service
diff --git a/files/etc/profile.d/startriver.sh b/files/etc/profile.d/startriver.sh
deleted file mode 100644
index d2e1690..0000000
--- a/files/etc/profile.d/startriver.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-    exec river &> /tmp/river.log
-fi
diff --git a/files/etc/skel/.config/river/init b/files/usr/etc/skel/.config/river/init
similarity index 100%
rename from files/etc/skel/.config/river/init
rename to files/usr/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
new file mode 100644
index 0000000..7bb9497
--- /dev/null
+++ b/files/usr/share/fish/vendor_conf.d/brew.fish
@@ -0,0 +1 @@
+[ -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
new file mode 100644
index 0000000..06fb317
--- /dev/null
+++ b/files/usr/share/fish/vendor_conf.d/startriver.fish
@@ -0,0 +1 @@
+[ -z $DISPLAY ] && [ (tty) = /dev/tty1 ] && status --is-login && exec river &> /tmp/river.log
diff --git a/packages b/packages
index 551a796..787da36 100644
--- a/packages
+++ b/packages
@@ -38,21 +38,23 @@ docker-compose-plugin
 # incus
 # incus-agent
 podman
+podman-compose
 podman-tui
+podmansh
 
-# # emulation
-# libvirt
-# qemu-char-spice
-# qemu-device-display-virtio-gpu
-# qemu-device-display-virtio-vga
-# qemu-device-usb-redirect
-# qemu-img
-# qemu-system-x86-core
-# qemu-user-binfmt
-# qemu-user-static
-# qemu
-# virt-manager
-# virt-viewer
+# emulation
+libvirt
+qemu-char-spice
+qemu-device-display-virtio-gpu
+qemu-device-display-virtio-vga
+qemu-device-usb-redirect
+qemu-img
+qemu-system-x86-core
+qemu-user-binfmt
+qemu-user-static
+qemu
+virt-manager
+virt-viewer
 
 # env
 polkit
@@ -77,6 +79,8 @@ pamixer
 pavucontrol
 
 # shell
+fish
+zsh
 zoxide
 elvish