From 2a018bd644cb23b80b852bd12eb3df05b27fceae Mon Sep 17 00:00:00 2001
From: Jackson Delahunt <jackson@stemn.com>
Date: Sun, 11 Jun 2023 15:31:54 +1000
Subject: [PATCH] 22.04

---
 docker/Dockerfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 2e92835..9377ee0 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:20.04
+FROM ubuntu:22.04
 
 ARG DESKTOP_ENVIRONMENT_HOST_USER_PASSWORD
 ARG DESKTOP_ENVIRONMENT_USER
@@ -243,9 +243,8 @@ RUN echo "deb http://packages.azlux.fr/debian/ buster main" | sudo tee /etc/apt/
   apt-get install -qq gping
 
 # Install i3
-RUN add-apt-repository ppa:regolith-linux/release && \
-  apt-get update -qq && \
-  apt-get install -qq i3-gaps dunst-
+RUN apt-get update -qq && \
+  apt-get install -qq i3 dunst-
 
 # Install i3blocks
 RUN git clone https://github.com/vivien/i3blocks /opt/i3blocks --depth 1 && \
@@ -433,7 +432,7 @@ RUN apt-get update -qq && \
   libpulse-dev \
   libsdl2-dev \
   libx11-dev && \
-  git clone --depth 1 https://github.com/sabrehagen/xava && \
+  git clone --depth 1 https://github.com/nikp123/xava && \
   mkdir xava/build && \
   cd xava/build && \
   cmake .. -DCMAKE_BUILD_TYPE=Debug -DINCLUDE_DIRS=lib/iniparser/src -DCMAKE_INSTALL_PREFIX=/usr -DWAYLAND=OFF && \