From e8b3761777f487072def22d5b493a8326fb1c475 Mon Sep 17 00:00:00 2001
From: Sohrab Behdani <behdanisohrab@gmail.com>
Date: Tue, 14 Feb 2023 13:42:03 +0330
Subject: [PATCH] init push

---
 .github/workflows/build.yaml                |  9 +++------
 iso/airootfs/etc/sddm.conf.d/autologin.conf |  4 ++--
 iso/packages.x86_64                         | 14 ++++++++++++++
 iso/pacman.conf                             |  9 ++-------
 iso/profiledef.sh                           | 10 ++++------
 tools/upload_assest.py                      | 16 +++++-----------
 6 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index dd4a62d..544b10e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,13 +1,14 @@
 # This workflow will build an Arch Linux ISO file with the commit on it
-name: Build Arch ISO with ArchInstall Commit
+name: build parchiso per release
 on:
   release:
     types:
       - created
+
 env:
   api_key: ${{ secrets.GITHUB_TOKEN }}
   name: ${{ github.event.repository.name }}
-  release_name: ${{ github.event.release.name }}
+  release_name: ${{ github.ref_name }}
 jobs:
   build:
     runs-on: ubuntu-latest
@@ -15,10 +16,6 @@ jobs:
       image: archlinux:latest
       options: --privileged
     steps:
-      - uses: crazy-max/ghaction-import-gpg@v4
-        with:
-          gpg_private_key: ${{ secrets.GPG_PRIVATE_KEY }}
-          passphrase: ${{ secrets.PASSPHRASE }}
       - uses: actions/checkout@v3
       - name: Install Packages via Pacman
         run: pacman -Sy; pacman --noconfirm -S git archiso python python-pip
diff --git a/iso/airootfs/etc/sddm.conf.d/autologin.conf b/iso/airootfs/etc/sddm.conf.d/autologin.conf
index 2b23ccf..0ccff8b 100644
--- a/iso/airootfs/etc/sddm.conf.d/autologin.conf
+++ b/iso/airootfs/etc/sddm.conf.d/autologin.conf
@@ -1,7 +1,7 @@
 [Autologin]
 Relogin=false
 User=liveuser
-Session=plasma
+Session=cinnamon
 
 [Theme]
-Current=breeze-dark
+Current=astronaut
diff --git a/iso/packages.x86_64 b/iso/packages.x86_64
index 1969efa..f40a2f3 100644
--- a/iso/packages.x86_64
+++ b/iso/packages.x86_64
@@ -138,6 +138,13 @@ openssl-1.1
 openssl
 
 #Desktop
+xfce4
+sddm
+xreader
+engrampa
+unzip
+unrar
+xfce4-goodies
 
 #systemutils
 btop
@@ -155,3 +162,10 @@ os-prober
 paru
 parch-branding
 parch-pacman
+appimagelauncher
+estedad-fonts
+fluent-gtk-theme-git
+hack-nerd-fonts
+sddm-theme-astronaut
+tela-circle-icon-theme-blue
+parch-os-wallpapers
diff --git a/iso/pacman.conf b/iso/pacman.conf
index 59d3499..bcf7163 100644
--- a/iso/pacman.conf
+++ b/iso/pacman.conf
@@ -34,7 +34,7 @@ Color
 #NoProgressBar
 CheckSpace
 #VerbosePkgLists
-ParallelDownloads = 5
+ParallelDownloads = 3
 ILoveCandy
 # By default, pacman accepts packages signed by keys that its local keyring
 # trusts (see pacman-key and its man page), as well as unsigned packages.
@@ -95,12 +95,7 @@ Include = /etc/pacman.d/mirrorlist
 
 [ppr]
 SigLevel = Optional TrustedOnly
-Server = https://parchlinux.github.io/ppr/$arch
-
-[pcp]
-SigLevel = Optional TrustedOnly
-Server = https://parchlinux.github.io/pcp/$arch
-
+Server = https://raw.githubusercontent.com/parchlinux/ppr/main/x86_64/
 # 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 b14333a..18dcdfe 100644
--- a/iso/profiledef.sh
+++ b/iso/profiledef.sh
@@ -1,12 +1,10 @@
 #!/usr/bin/env bash
 # shellcheck disable=SC2034
 
-iso_name="Parchlinux"
-iso_label="PARCH_$(date +%Y%m)"
-iso_publisher="Parch Linux <https://github.com/parch-os/>"
-iso_application="Parch Linux Live/Rescue CD"
-#gpg_key="BC9DCC3C9A0B047F53065EEBFB8554F927F96E60"
-#gpg_signer="KomeilParseh <ahmdparsh129@gmail.com>"
+iso_name="Parchlinux XFCE"
+iso_label="PARCH_XFCE_$(date +%Y%m)"
+iso_publisher="Parch Linux <https://github.com/parchlinux/>"
+iso_application="Parch Linux Xfce Live/Rescue CD"
 iso_version="$(date +%Y.%m.%d)"
 install_dir="arch"
 buildmodes=('iso')
diff --git a/tools/upload_assest.py b/tools/upload_assest.py
index 4dbaf86..2c56408 100644
--- a/tools/upload_assest.py
+++ b/tools/upload_assest.py
@@ -2,17 +2,16 @@ import logging
 import os
 import sys
 from datetime import datetime
-from glob import glob
-
+from pathlib import Path
 from github import Github
 
 logging.basicConfig(level=logging.INFO, format="%(levelname)s: %(message)s")
 
 api_key = os.getenv("api_key", None)
 current_date = datetime.today().strftime("%Y-%m-%d")
-path = glob(r"/__w/parch-iso-template/parch-iso-template/out/*.iso")[
-    0
-]  # edit this if your not use in workflow
+
+path = list(Path().cwd().glob("out/*.iso"))[0].as_posix()
+
 repo_name = os.getenv("name", None)
 release_name = os.getenv("release_name", None)
 
@@ -27,7 +26,7 @@ if not (repo_name and api_key and release_name):
 
 
 gh = Github(api_key)
-repo = gh.get_repo(f"parch-os/{repo_name}")
+repo = gh.get_repo(f"parchlinux/{repo_name}")
 
 release = repo.get_release(release_name)
 
@@ -35,8 +34,3 @@ logging.info("statrting Upload ISO to release")
 
 release.upload_asset(path=path)
 logging.info("ISO upload is done")
-
-logging.info("statrting Upload ISO gpg key to release")
-release.upload_asset(
-    "/__w/parch-iso-template/parch-iso-template/iso/public.key"
-)  # noqa: E501:w