diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 699fb47..ef5468e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -23,7 +23,7 @@ build_iso: - cp base ~/artools-workspace/iso-profiles -r - mkdir -p ~/.config/artools - cp config/pacman.conf /usr/share/artools/pacman.conf.d/default.conf - - cp -r config/me* /etc/pacman.d/ + - cp -r config/parch* /etc/pacman.d/ - ./build-iso.sh - echo "Renaming the output ISO file" - mv out/*.iso out/ParchLinux-$Desktop-latest.iso diff --git a/config/metis-mirrorlist-andromeda b/config/metis-mirrorlist-andromeda deleted file mode 100644 index 1a08774..0000000 --- a/config/metis-mirrorlist-andromeda +++ /dev/null @@ -1,3 +0,0 @@ -# main server -Server = https://metis-os.github.io/repo-andromeda/$repo/os/$arch - diff --git a/config/metis-mirrorlist-cosmic b/config/metis-mirrorlist-cosmic deleted file mode 100644 index 2f778f3..0000000 --- a/config/metis-mirrorlist-cosmic +++ /dev/null @@ -1,3 +0,0 @@ -# main server -Server = https://metis-os.github.io/repo-cosmic/$repo/os/$arch - diff --git a/config/metis-mirrorlist-recon b/config/metis-mirrorlist-recon deleted file mode 100644 index f9c57a6..0000000 --- a/config/metis-mirrorlist-recon +++ /dev/null @@ -1,7 +0,0 @@ -# main server -Server = https://metis-os.github.io/repo-recon/$repo/os/$arch - - -# codedsprit's fork -Server = https://codedsprit.github.io/repo-recon/$repo/os/$arch - diff --git a/config/pacman-default.conf b/config/pacman-default.conf index 66a90da..635182d 100644 --- a/config/pacman-default.conf +++ b/config/pacman-default.conf @@ -34,7 +34,8 @@ Architecture = auto #NoProgressBar CheckSpace #VerbosePkgLists -ParallelDownloads = 8 +ParallelDownloads = 5 +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. @@ -72,18 +73,13 @@ LocalFileSigLevel = Optional #[gremlins] #Include = /etc/pacman.d/mirrorlist -[andromeda] +[ppr] SigLevel = Optional TrustAll -Include = /etc/pacman.d/metis-mirrorlist-andromeda +Include = /etc/pacman.d/parch-mirrors -[cosmic] +[pcp] SigLevel = Optional TrustAll -Include = /etc/pacman.d/metis-mirrorlist-cosmic - -[recon] -SigLevel = Optional TrustAll -Include = /etc/pacman.d/metis-mirrorlist-recon - +Include = /etc/pacman.d/parch-mirrors [system] Include = /etc/pacman.d/mirrorlist diff --git a/config/pacman.conf b/config/pacman.conf index 66a90da..635182d 100644 --- a/config/pacman.conf +++ b/config/pacman.conf @@ -34,7 +34,8 @@ Architecture = auto #NoProgressBar CheckSpace #VerbosePkgLists -ParallelDownloads = 8 +ParallelDownloads = 5 +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. @@ -72,18 +73,13 @@ LocalFileSigLevel = Optional #[gremlins] #Include = /etc/pacman.d/mirrorlist -[andromeda] +[ppr] SigLevel = Optional TrustAll -Include = /etc/pacman.d/metis-mirrorlist-andromeda +Include = /etc/pacman.d/parch-mirrors -[cosmic] +[pcp] SigLevel = Optional TrustAll -Include = /etc/pacman.d/metis-mirrorlist-cosmic - -[recon] -SigLevel = Optional TrustAll -Include = /etc/pacman.d/metis-mirrorlist-recon - +Include = /etc/pacman.d/parch-mirrors [system] Include = /etc/pacman.d/mirrorlist