diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 4187f88..d01dcdb 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -15,6 +15,10 @@ jobs: options: --privileged steps: - uses: actions/checkout@v3 + - name: Add Trinity keys + run: | + pacman-key --recv-keys 8685AD8B + pacman-key --refresh-keys - name: Install Packages via Pacman run: | pacman -Suy --noconfirm --noprogressbar diff --git a/README.md b/README.md index 0acc702..88f8a5a 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,2 @@ -# Parch Linux iso template +# Parch Linux Trinity edition -## Use this template for making releases \ No newline at end of file diff --git a/iso/efiboot/loader/loader.conf b/iso/efiboot/loader/loader.conf index 2d137aa..982641e 100644 --- a/iso/efiboot/loader/loader.conf +++ b/iso/efiboot/loader/loader.conf @@ -1,3 +1,3 @@ timeout 15 default 01-archiso-x86_64-linux.conf -beep on +beep off diff --git a/iso/packages.x86_64 b/iso/packages.x86_64 index 38ba952..e126bce 100644 --- a/iso/packages.x86_64 +++ b/iso/packages.x86_64 @@ -40,8 +40,6 @@ grub hdparm hyperv intel-ucode -#ipw2100-fw -#ipw2200-fw irssi iw iwd @@ -93,7 +91,6 @@ python python-psutil python-systemd refind -#reflector reiserfsprogs rp-pppoe rsync @@ -137,16 +134,18 @@ gvfs gvfs-mtp networkmanager android-file-transfer +sddm +parch-grub #Desktop +tde-meta #systemutils btop xdg-user-dirs packagekit-qt5 neofetch-git -ttf-ms-fonts -parch-firefox-config +ttf-dejavu firefox #parchlinuxstuff @@ -157,3 +156,4 @@ paru parch-emoji-ios parch-branding parch-pacman +parch-tde diff --git a/iso/pacman.conf b/iso/pacman.conf index 12b4c71..706711c 100644 --- a/iso/pacman.conf +++ b/iso/pacman.conf @@ -98,6 +98,9 @@ Server = https://raw.githubusercontent.com/parchlinux/ppr/main/x86_64/ SigLevel = Optional TrustedOnly Server = https://raw.githubusercontent.com/parchlinux/pcp/main/x86_64/ +[trinity] +Server = https://mirror.ppa.trinitydesktop.org/trinity/archlinux/$arch + # An example of a custom package repository. See the pacman manpage for # tips on creating your own repositories. #[custom] diff --git a/iso/profiledef.sh b/iso/profiledef.sh index 3b7f7da..4a62a0b 100644 --- a/iso/profiledef.sh +++ b/iso/profiledef.sh @@ -1,8 +1,8 @@ #!/usr/bin/env bash # shellcheck disable=SC2034 -iso_name="Parchlinux" -iso_label="PARCH_$(date +%Y%m)" +iso_name="Parchlinux Trinity" +iso_label="PARCH_LINUX_TRINITY$(date +%Y%m)" iso_publisher="Parch Linux " iso_application="Parch Linux Live/Rescue CD" iso_version="$(date +%Y.%m.%d)"