From 3f5ae4bc400da6a2f3d9f52710bbcef29b5bfb08 Mon Sep 17 00:00:00 2001
From: "Ward Nakchbandi (Cosmic Fusion)"
 <83735213+CosmicFusion@users.noreply.github.com>
Date: Wed, 6 Sep 2023 01:41:11 +0300
Subject: [PATCH]

---
 pika-sources/debian/changelog                         |  2 +-
 .../apt-pika/apt/preferences.d/1-pika-ubuntu-settings | 11 +----------
 .../apt-pika/apt/sources.list.d/pika-main.sources     |  7 -------
 .../share/apt-pika/apt/sources.list.d/system.sources  | 11 ++++++-----
 4 files changed, 8 insertions(+), 23 deletions(-)
 delete mode 100644 pika-sources/usr/share/apt-pika/apt/sources.list.d/pika-main.sources

diff --git a/pika-sources/debian/changelog b/pika-sources/debian/changelog
index 4df13c4..06d0abc 100644
--- a/pika-sources/debian/changelog
+++ b/pika-sources/debian/changelog
@@ -1,4 +1,4 @@
-pika-sources (6.0-99pika4-lunar) lunar; urgency=low
+pika-sources (6.1-99pika1-lunar) lunar; urgency=low
 
   *  Switch to internal repos
 
diff --git a/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings b/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings
index 1017b27..33e76ae 100644
--- a/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings
+++ b/pika-sources/usr/share/apt-pika/apt/preferences.d/1-pika-ubuntu-settings
@@ -1,14 +1,5 @@
 # Lower Ubuntu's priority under pika's
 Package: *
-Pin: release o=Ubuntu
-Pin-Priority: 400
-
-# Enable Ubuntu's Feature Updates
-Package: *
-Pin: release a=$(lsb_release -cs)-backports
-Pin-Priority: 400
-
-Package: *
-Pin: release a=$(lsb_release -cs)-proposed
+Pin: release o=ppa.pika-os.com,c=ubuntu
 Pin-Priority: 400
 
diff --git a/pika-sources/usr/share/apt-pika/apt/sources.list.d/pika-main.sources b/pika-sources/usr/share/apt-pika/apt/sources.list.d/pika-main.sources
deleted file mode 100644
index a0c542d..0000000
--- a/pika-sources/usr/share/apt-pika/apt/sources.list.d/pika-main.sources
+++ /dev/null
@@ -1,7 +0,0 @@
-X-Repolib-Name: PikaOS APT Sources
-Enabled: yes
-Types: deb deb-src
-URIs: https://ppa.pika-os.com/
-Suites: lunar
-Components: main amdgpu rocm external
-Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
diff --git a/pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources b/pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources
index 575a705..7f4e372 100644
--- a/pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources
+++ b/pika-sources/usr/share/apt-pika/apt/sources.list.d/system.sources
@@ -1,8 +1,9 @@
-X-Repolib-Name: Ubuntu System Sources
+X-Repolib-Name: PikaOS System Sources
 Enabled: yes
 Types: deb deb-src
-URIs: http://archive.ubuntu.com/ubuntu/
-Suites: lunar lunar-security lunar-updates lunar-backports lunar-proposed
-Components: main restricted universe multiverse
+URIs: https://ppa.pika-os.com/
+Suites: lunar
+Components: main amdgpu rocm external ubuntu
 X-Repolib-ID: system
-X-Repolib-Default-Mirror: http://archive.ubuntu.com/ubuntu/
+X-Repolib-Default-Mirror: https://ppa.pika-os.com/
+Signed-By: /etc/apt/keyrings/pika-keyring.gpg.key
\ No newline at end of file