diff --git a/install b/install index a784c3c..8d587ac 100755 --- a/install +++ b/install @@ -149,47 +149,47 @@ fi ############################################################################### # Install package manager and packages # ############################################################################### -# print_section "Installing package requirements" -# sudo pacman -S sudo ccache git base-devel --noconfirm --needed +print_section "Installing package requirements" +sudo pacman -S sudo ccache git base-devel --noconfirm --needed -# print_section "Installing yay" -# is_yay_installed=$(command -v yay) +print_section "Installing yay" +is_yay_installed=$(command -v yay) -# # Install yay if not already installed -# if [ -z "${is_yay_installed}" ]; then -# git clone https://aur.archlinux.org/yay.git -# ( -# cd yay || exit -# makepkg -si --noconfirm --skippgpcheck -# ) -# rm -rf yay -# else -# print_log "yay is already installed" -# fi +# Install yay if not already installed +if [ -z "${is_yay_installed}" ]; then + git clone https://aur.archlinux.org/yay.git + ( + cd yay || exit + makepkg -si --noconfirm --skippgpcheck + ) + rm -rf yay +else + print_log "yay is already installed" +fi -# print_section "Installing native packages" -# # List created using: yay -Qqen > packages.native.list -# package_count=$(< "${PACKAGES_DIR}/packages.native.list" wc -l) -# print_log "Installing ${package_count} packages" -# yay -Syy > /dev/null 2>&1 -# yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.native.list" +print_section "Installing native packages" +# List created using: yay -Qqen > packages.native.list +package_count=$(< "${PACKAGES_DIR}/packages.native.list" wc -l) +print_log "Installing ${package_count} packages" +yay -Syy > /dev/null 2>&1 +yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.native.list" -# print_section "Installing Rust toolchain and components" -# rustup toolchain install beta -# rustup default beta -# rustup component add "${RUST_COMPONENTS[@]}" -# rustup default beta +print_section "Installing Rust toolchain and components" +rustup toolchain install beta +rustup default beta +rustup component add "${RUST_COMPONENTS[@]}" +rustup default beta -# print_section "Installing AUR packages" -# package_count=$(< "${PACKAGES_DIR}/packages.aur.list" wc -l) -# # List created using: yay -Qqem > packages.aur.list -# print_log "Installing ${package_count} packages" -# yay -Syy > /dev/null 2>&1 -# yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.aur.list" +print_section "Installing AUR packages" +package_count=$(< "${PACKAGES_DIR}/packages.aur.list" wc -l) +# List created using: yay -Qqem > packages.aur.list +print_log "Installing ${package_count} packages" +yay -Syy > /dev/null 2>&1 +yay -S --noconfirm --sudoloop --needed --devel --nopgpfetch --mflags --skippgpcheck - < "${PACKAGES_DIR}/packages.aur.list" -# print_section "Installing global npm packages" -# print_log "Installing ${#NPM_PACKAGES[@]} packages" -# npm i -g "${NPM_PACKAGES[@]}" +print_section "Installing global npm packages" +print_log "Installing ${#NPM_PACKAGES[@]} packages" +npm i -g "${NPM_PACKAGES[@]}" ############################################################################### # Creating directories # diff --git a/system/.local/bin/resolution b/system/.local/bin/resolution index 6133bda..252a46e 100755 --- a/system/.local/bin/resolution +++ b/system/.local/bin/resolution @@ -33,13 +33,13 @@ xrandr --output eDP1 --primary --mode 1920x1080 --pos 1280x0 --rotate normal xrandr --output eDP-1-1 --primary --mode 1920x1080 --pos 1280x0 --rotate normal if is-connected "DVI-I-1-1"; then - xrandr --output DVI-I-1-1 --off -else xrandr --output DVI-I-1-1 --mode 1920x1080 --left-of eDP1 +else + xrandr --output DVI-I-1-1 --off fi if is-connected "DVI-I-2-1"; then - xrandr --output DVI-I-2-1 --off -else xrandr --output DVI-I-2-1 --mode 1920x1080 --left-of eDP-1-1 +else + xrandr --output DVI-I-2-1 --off fi