diff --git a/.local/installers/artix-install.sh b/.local/installers/artix-install.sh index 2248021..d862faf 100755 --- a/.local/installers/artix-install.sh +++ b/.local/installers/artix-install.sh @@ -1,7 +1,5 @@ #!/bin/sh - - GIT_REPOS_DIR="$HOME/.local/src/" @@ -14,22 +12,24 @@ enable_repo() { MIRRORLIST="mirrorlist" [ "$2" ] && MIRRORLIST="$2" - if [ $# -gt 0 ] && [ -z "$(grep "$1" /etc/pacman.conf)" ]; then - sudo sh -c 'echo "[$REPO]" >> /etc/pacman.conf' - sudo sh -c 'echo "Include = /etc/pacman.d/$MIRRORLIST" >> /etc/pacman.conf' - sudo sh -c 'echo "" >> /etc/pacman.conf' + if [ $# -gt 0 ] && [ -z "$(grep "^\[$1" /etc/pacman.conf)" ]; then + sudo sh -c "echo "[$REPO]" >> /etc/pacman.conf" + sudo sh -c "echo "Include\ =\ /etc/pacman.d/$MIRRORLIST" >> /etc/pacman.conf" + sudo sh -c "echo "" >> /etc/pacman.conf" fi } enable_repos() { + #enable lib32 + enable_repo lib32 + + sudo pacman -Sy + #add arch linux repos sudo pacman -S --noconfirm artix-archlinux-support lib32-artix-archlinux-support sudo pacman-key --populate archlinux sudo pacman -Sy - #enable lib32 - enable_repo lib32 - #enable arch community repo enable_repo community mirrorlist-arch @@ -51,19 +51,8 @@ enable_repos() { git clone https://aur.archlinux.org/yay.git ~/.local/src/yay/ cd ~/.local/src/yay || return makepkg -si - -} - -install_git_repos() { - - mkdir -p "$GIT_REPOS_DIR" - cd "$GIT_REPOS_DIR" - - for REPO in "$@" - do - git clone "$REPO" - done cd - + } runit_setup() { @@ -102,7 +91,12 @@ gaming() { elif [ "$1" = "--intel" ]; then INTEL_GPU="TRUE" else - help && exit + echo "Enter GPU type (amd nvidia intel):" + read input + + [ "$input" = "amd" ] && AMD_GPU="TRUE" + [ "$input" = "nvidia" ] && NVIDIA_GPU="TRUE" + [ "$input" = "intel" ] && INTEL_GPU="TRUE" fi CMD=" -S --noconfirm " @@ -258,15 +252,15 @@ base() { #enable repos (lib32, community, and universe) and install yay enable_repos - + #install all packages in $PKGS - pacman -S - < ./pkgs/base.list + sudo pacman --noconfirm -S - < ./pkgs/base.list #installl all packages in $AUR_PKGS - yay -S - < ./pkgs/aur.list + yay --noconfirm -S - < ./pkgs/aur.list #setup local git repos defined in $GIT_REPOS to $GIT_REPOS_DIR - install_git_repos + sh ~/.local/scripts/install.sh add-repos ./pkgs/repos.list #runit configuration runit_setup @@ -274,6 +268,8 @@ base() { #configure programs, directories, change shell, etc configure + + #install microcode for CPU echo "enter CPU type to install microcode for (amd intel)" read input @@ -323,3 +319,4 @@ done [ "$WIRELESS" ] && wireless [ "$UNGOOGLED_CHROMIUM" ] && ungoogled_chromium "$@" [ "$VIRT_MANAGER" ] && virt_manager + diff --git a/.local/installers/pkgs/aur.list b/.local/installers/pkgs/aur.list new file mode 100644 index 0000000..633fe99 --- /dev/null +++ b/.local/installers/pkgs/aur.list @@ -0,0 +1,10 @@ +lf +mutt-wizard +htim +jmtpfs +tremc-git +dashbinsh +pfetch +sysrq-enabler +wlr-randr +sfeed diff --git a/.local/installers/pkgs/base.list b/.local/installers/pkgs/base.list new file mode 100644 index 0000000..a98b7b3 --- /dev/null +++ b/.local/installers/pkgs/base.list @@ -0,0 +1,81 @@ +pipewire +pipewire-alsa +pipewire-pulse +pipewire-jack +gst-plugin-pipewire +wireplumber +wireplumber-docs +alsa-utils +pacman-contrib +man-db +freetype2 +gst-libav +xdg-utils +xdg-user-dirs +fuse +python-urwid +btrfs-progs +reiserfsprogs +chrony +ufw +wget +curl +zip +unzip +p7zip +dash +mesa +rsync +cronie +connman +fakeroot +socklog +python-pip +udevil +pavucontrol +connman-gtk +youtube-dl +transmission-cli +neovim +mpd +mpv +opendoas +zsh +clang +librewolf +shellcheck +noto-fonts +noto-fonts-emoji +noto-fonts-cjk +lxappearance +qt5ct +imagemagick +ffmpegthumbnailer +python-pywal +pulsemixer +pamixer +papirus-icon-theme +python-pdftotext +viu +bat +zathura +zathura-cb +zathura-djvu +zathura-pdf-mupdf +sway +swaybg +swayidle +swaylock +waybar +bemenu-wayland +mako +wl-clipboard +grim +slurp +xorg-xwayland +alacritty +gammastep +ufw-runit +cronie-runit +chrony-runit +connman-runit diff --git a/.local/installers/repos.txt b/.local/installers/pkgs/repos.list similarity index 100% rename from .local/installers/repos.txt rename to .local/installers/pkgs/repos.list