From 2167af470305a08e5990babd09df8aa814ec5938 Mon Sep 17 00:00:00 2001 From: Randall Winkhart Date: Sun, 26 Jun 2022 15:43:28 -0400 Subject: [PATCH] Added g14-pacman.conf --- chrootInstall.sh | 3 +- config-files/g14-pacman.conf | 104 +++++++++++++++++++++++++++++++++++ install.sh | 7 +++ 3 files changed, 113 insertions(+), 1 deletion(-) create mode 100755 config-files/g14-pacman.conf diff --git a/chrootInstall.sh b/chrootInstall.sh index 1a2d75c..8356524 100755 --- a/chrootInstall.sh +++ b/chrootInstall.sh @@ -2,6 +2,7 @@ # Importing Variables formfactor="$(cat /tempfiles/formfactor)" +device="$(cat /tempfiles/device)" cpu="$(cat /tempfiles/cpu)" gpu="$(cat /tempfiles/gpu)" intel_vaapi_driver="$(cat /tempfiles/intel_vaapi_driver)" @@ -59,7 +60,7 @@ curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/confi chown "$username":"$users" /home/"$username"/.bashrc # pacman configuration -curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/pacman.conf -o /etc/pacman.conf +curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/"$device"pacman.conf -o /etc/pacman.conf curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/paru.conf -o /etc/paru.conf curl https://raw.githubusercontent.com/rwinkhart/artix-install-script/main/config-files/paccache-clean-hook -o /etc/pacman.d/hooks/paccache-clean.hook if [ "$gpu" == 'NVIDIA' ]; then diff --git a/config-files/g14-pacman.conf b/config-files/g14-pacman.conf new file mode 100755 index 0000000..e902f99 --- /dev/null +++ b/config-files/g14-pacman.conf @@ -0,0 +1,104 @@ +# +# rwinkhart/artix-install-script 06/26/2022 +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +#GPGDir = /etc/pacman.d/gnupg/ +#HookDir = /etc/pacman.d/hooks/ +HoldPkg = pacman glibc +#XferCommand = /usr/bin/curl -L -C - -f -o %o %u +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#CleanMethod = KeepInstalled +Architecture = auto + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options +#UseSyslog +Color +#NoProgressBar +CheckSpace +#VerbosePkgLists + +# 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. +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required + +# NOTE: You must run `pacman-key --init` before first using pacman; the local +# keyring can then be populated with the keys of all official Artix Linux +# packagers with `pacman-key --populate artix`. + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# - URLs will have $arch replaced by the name of the architecture +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# The gremlins repositories are disabled by default. To enable, uncomment the +# repo name header and Include lines. You can add preferred servers immediately +# after the header, and they will be used before the default mirrors. + +#[gremlins] +#Include = /etc/pacman.d/mirrorlist + +[system] +Include = /etc/pacman.d/mirrorlist + +[world] +Include = /etc/pacman.d/mirrorlist + +#[galaxy-gremlins] +#Include = /etc/pacman.d/mirrorlist + +[galaxy] +Include = /etc/pacman.d/mirrorlist + +# If you want to run 32 bit applications on your x86_64 system, +# enable the lib32 repositories as required here. + +#[lib32-gremlins] +#Include = /etc/pacman.d/mirrorlist + +#[lib32] +#Include = /etc/pacman.d/mirrorlist + +[g14] +SigLevel = DatabaseNever Optional TrustAll +Server = https://arch.asus-linux.org + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#SigLevel = Optional TrustAll +#Server = file:///home/custompkgs diff --git a/install.sh b/install.sh index 2b047f1..628a090 100755 --- a/install.sh +++ b/install.sh @@ -58,6 +58,12 @@ fi if [[ "$disk" == /dev/mmcblk* ]]; then disk="$disk"'p' fi + +if [ "$formfactor" == 1 ]; then + device='g14-' +else + device='' +fi # stop variable manipulation # determine if running as UEFI or BIOS @@ -164,6 +170,7 @@ basestrap /mnt base $base_devel openrc elogind-openrc linux linux-firmware git m # exporting variables mkdir /mnt/tempfiles echo "$formfactor" > /mnt/tempfiles/formfactor +echo "$device" > /mnt/tempfiles/device echo "$cpu" > /mnt/tempfiles/cpu echo "$gpu" > /mnt/tempfiles/gpu echo "$intel_vaapi_driver" > /mnt/tempfiles/intel_vaapi_driver