From 4cd17487b8eb9a70a4463383d833eb293e0031ad Mon Sep 17 00:00:00 2001
From: "Ward Nakchbandi (Cosmic Fusion)"
 <83735213+CosmicFusion@users.noreply.github.com>
Date: Sat, 30 Mar 2024 17:09:23 +0300
Subject: [PATCH]

---
 Dockerfile |  2 +-
 setup.sh   | 30 ++++++++++++++----------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 36e9363..b494e59 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,5 +9,5 @@ RUN ./setup.sh
 RUN apt update
 RUN apt full-upgrade -y
 RUN ln -fs /usr/share/zoneinfo/America/New_York /etc/localtime
-RUN wget https://ppa.pika-os.com/pool/main/p/pika-pbuilder/pika-pbuilder_0.2.3-101pika1_all.deb
+RUN wget https://ppa.pika-os.com/pool/main/p/pika-pbuilder/pika-pbuilder_0.2.4-101pika1_all.deb
 RUN DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata software-properties-common sudo git bc gpg gpg-agent bison build-essential ccache cmake cpio fakeroot flex git kmod libelf-dev libncurses5-dev libssl-dev lz4 qtbase5-dev rsync schedtool wget zstd tar aptly devscripts dh-make rpm2cpio ./pika-pbuilder_0.2.3-101pika1_all.deb -o Dpkg::Options::="--force-confnew"
diff --git a/setup.sh b/setup.sh
index 6d46c44..6e3e7cb 100644
--- a/setup.sh
+++ b/setup.sh
@@ -1,4 +1,5 @@
 #! /bin/bash
+
 mkdir -p /etc/apt/sources.list.d
 
 # Clear /etc/apt/sources.list in favor of deb822 formats
@@ -21,17 +22,17 @@ Signed-by: /usr/share/keyrings/debian-archive-keyring.gpg
 EOF
 
 # Add Pika Repos
-# tee /etc/apt/sources.list.d/system.sources <<'EOF'
-# X-Repolib-Name: PikaOS System Sources
-# Enabled: yes
-# Types: deb
-# URIs: https://ppa.pika-os.com/
-# Suites: pikauwu
-# Components: main amdgpu rocm
-# X-Repolib-ID: system
-# X-Repolib-Default-Mirror: https://ppa.pika-os.com/
-# Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
-# EOF
+tee /etc/apt/sources.list.d/system.sources <<'EOF'
+X-Repolib-Name: PikaOS System Sources
+Enabled: yes
+Types: deb
+URIs: https://ppa.pika-os.com/
+Suites: pikauwu
+Components: canary
+X-Repolib-ID: system
+X-Repolib-Default-Mirror: https://ppa.pika-os.com/
+Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
+EOF
 
 # Add DMO Repos
 tee /etc/apt/sources.list.d/dmo.sources <<'EOF'
@@ -57,9 +58,6 @@ X-Repolib-Default-Mirror: http://archive.neon.kde.org/user/
 Signed-By: /etc/apt/keyrings/kde-neon-keyring.gpg.key
 EOF
 
-# # Workarounds Repo
-# echo "deb [trusted=yes] https://raw.githubusercontent.com/cosmicfusion/debian-workaround-packages-repo/main sid main" > /etc/apt/sources.list.d/cosmo-workarounds.list
-
 # Get keyrings
 mkdir -p /etc/apt/keyrings/
 wget https://github.com/PikaOS-Linux/pika-base-debian-container/raw/main/pika-keyring.gpg.key -O /etc/apt/keyrings/pika-keyring.gpg.key
@@ -98,7 +96,7 @@ Pin-Priority: -1
 
 # Give pika lowest priority because we don't want it sources overwriting
 Package: *
-Pin: release a=pikauwu,c=main
+Pin: release a=pikauwu,c=canary
 Pin-Priority: 390
 EOF
 
@@ -122,4 +120,4 @@ Pin-Priority: 400
 Package: amdgpu-core amdgpu-pro-core amdgpu-dkms amdgpu-pro-lib32
 Pin: release a=*
 Pin-Priority: -10
-EOF
+EOF
\ No newline at end of file