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