From 880c7b90a1bff0a3033f52930ed7aa4a16517528 Mon Sep 17 00:00:00 2001
From: Bastien Riviere <me@babariviere.com>
Date: Sun, 17 Nov 2024 19:59:08 +0100
Subject: [PATCH 1/2] feat: switch to niri

---
 build.sh                                    | 14 ++++++++++++++
 files/usr/lib/systemd/user/swayidle.service |  8 ++++++++
 packages                                    | 11 ++++-------
 3 files changed, 26 insertions(+), 7 deletions(-)
 create mode 100644 files/usr/lib/systemd/user/swayidle.service

diff --git a/build.sh b/build.sh
index 1b50a15..62f07d3 100755
--- a/build.sh
+++ b/build.sh
@@ -6,6 +6,9 @@ RELEASE="$(rpm -E %fedora)"
 
 ### Add repos
 
+# Add niri repo
+curl -Lo /etc/yum.repos.d/yalter-niri-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/yalter/niri/repo/fedora-"${RELEASE}"/yalter-niri-fedora-"${RELEASE}".repo
+
 # Add Staging repo
 curl -Lo /etc/yum.repos.d/ublue-os-staging-fedora-"${RELEASE}".repo https://copr.fedorainfracloud.org/coprs/ublue-os/staging/repo/fedora-"${RELEASE}"/ublue-os-staging-fedora-"${RELEASE}".repo
 
@@ -60,12 +63,23 @@ WantedBy=default.target
 EOF
 done
 
+#### Setup niri deps
+
+mkdir /usr/lib/systemd/user/niri.service.wants
+ln -s /usr/lib/systemd/user/mako.service /usr/lib/systemd/user/niri.service.wants/
+ln -s /usr/lib/systemd/user/waybar.service /usr/lib/systemd/user/niri.service.wants/
+ln -s /usr/lib/systemd/user/swayidle.service /usr/lib/systemd/user/niri.service.wants/
+ln -s /usr/lib/systemd/user/kanshi.service /usr/lib/systemd/user/niri.service.wants/
+
 #### Services
 
 # systemctl enable docker.socket
 systemctl enable podman.socket
 systemctl enable podman-auto-update.timer
 # systemctl enable tailscaled.service
+
+systemctl enable -f --global niri.service
+
 systemctl enable -f --global flatpak-setup.service
 systemctl enable -f --global azure-topgrade.service
 systemctl enable -f --global azure-cli.target
diff --git a/files/usr/lib/systemd/user/swayidle.service b/files/usr/lib/systemd/user/swayidle.service
new file mode 100644
index 0000000..dd74f93
--- /dev/null
+++ b/files/usr/lib/systemd/user/swayidle.service
@@ -0,0 +1,8 @@
+[Unit]
+PartOf=graphical-session.target
+After=graphical-session.target
+Requisite=graphical-session.target
+
+[Service]
+ExecStart=/usr/bin/swayidle -w
+Restart=on-failure
diff --git a/packages b/packages
index 00e3dc2..48b18ea 100644
--- a/packages
+++ b/packages
@@ -1,6 +1,6 @@
 # Compositor
 xorg-x11-server-Xwayland
-river
+niri
 
 # apps
 foot
@@ -8,17 +8,14 @@ mako
 waybar
 kanshi
 fuzzel
-
-# Fingerprint
+swaybg
+swayidle
+swaylock
 
 # fonts
 nerd-fonts
 fontawesome-fonts-all
 
-# lock
-swayidle
-swaylock
-
 # utility
 slurp
 grimshot

From 23cc0fcc02d216b4aead23c9d1f3fc41ec9e1e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastien=20Rivi=C3=A8re?= <me@babariviere.com>
Date: Sun, 17 Nov 2024 21:45:41 +0100
Subject: [PATCH 2/2] fix: switch to nvidia image

---
 Containerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Containerfile b/Containerfile
index 379aa1c..42442d4 100644
--- a/Containerfile
+++ b/Containerfile
@@ -33,7 +33,7 @@ ARG SOURCE_IMAGE="base"
 # - stable-zfs
 # - stable-nvidia-zfs
 # - (and the above with testing rather than stable)
-ARG SOURCE_SUFFIX="-main"
+ARG SOURCE_SUFFIX="-nvidia"
 
 ## SOURCE_TAG arg must be a version built for the specific image: eg, 39, 40, gts, latest
 ARG SOURCE_TAG="latest"