From d64c473e0ae6abc15e8bdc7002dbcde6bdfa5baf Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 12 Oct 2024 21:30:20 +0200
Subject: [PATCH 1/3] chore: install 1password

---
 build.sh | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/build.sh b/build.sh
index e1653d8..3e3bbcf 100755
--- a/build.sh
+++ b/build.sh
@@ -17,10 +17,24 @@ 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
 
 
@@ -37,7 +51,6 @@ 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

From 50b6a5590cedd0db51859e168109a8ff4ade3c6d Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 12 Oct 2024 21:35:40 +0200
Subject: [PATCH 2/3] chore: remove useless packages

---
 packages | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/packages b/packages
index 787da36..551a796 100644
--- a/packages
+++ b/packages
@@ -38,23 +38,21 @@ 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
@@ -79,8 +77,6 @@ pamixer
 pavucontrol
 
 # shell
-fish
-zsh
 zoxide
 elvish
 

From 57400f80f1be0a45d8ae30ba90a091e7fd8f4e35 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sat, 12 Oct 2024 21:59:21 +0200
Subject: [PATCH 3/3] fix: use bash for starting river

---
 files/etc/profile.d/startriver.sh                  | 5 +++++
 files/{usr => }/etc/skel/.config/river/init        | 0
 files/usr/share/fish/vendor_conf.d/brew.fish       | 1 -
 files/usr/share/fish/vendor_conf.d/startriver.fish | 1 -
 4 files changed, 5 insertions(+), 2 deletions(-)
 create mode 100644 files/etc/profile.d/startriver.sh
 rename files/{usr => }/etc/skel/.config/river/init (100%)
 delete mode 100644 files/usr/share/fish/vendor_conf.d/brew.fish
 delete mode 100644 files/usr/share/fish/vendor_conf.d/startriver.fish

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