diff --git a/.github/README.md b/.github/README.md index 27dcf69..4dc56d1 100644 --- a/.github/README.md +++ b/.github/README.md @@ -588,7 +588,7 @@ You will be prompted before anything is installed. Be sure to remove / comment o - Linux (desktop): [`flatpak.sh`](https://github.com/Lissy93/dotfiles/blob/master/installs/flatpak.sh) - Desktop apps can be installed on Linux systems via [Flatpack](https://flatpak.org/) - Mac OS: [`.Brewfile`](https://github.com/Lissy93/dotfiles/blob/master/installs/Brewfile) - Mac apps installed via [Homebrew](https://brew.sh/) -- Arch (and Arch-based systems, like Manjaro): [`pacman.sh`](https://github.com/Lissy93/dotfiles/blob/master/installs/pacman.sh) - Arch CLI apps installed via [pacman](https://wiki.archlinux.org/title/Pacman) +- Arch (and Arch-based systems, like Manjaro): [`arch-pacman.sh`](https://github.com/Lissy93/dotfiles/blob/master/installs/arch-pacman.sh) - Arch CLI apps installed via [pacman](https://wiki.archlinux.org/title/Pacman) - Debian (and Debian-based systems, like Ubuntu): [`apt.sh`](https://github.com/Lissy93/dotfiles/blob/master/installs/apt.sh) - Debian CLI apps installed via [apt](https://wiki.debian.org/Apt) - Alpine: [`apk.sh`](https://github.com/Lissy93/dotfiles/blob/master/installs/apk.sh) - Alpine CLI apps installed via [apk](https://docs.alpinelinux.org/user-handbook/0.1a/Working/apk.html) diff --git a/install.sh b/install.sh index 25c2f13..c8ba52b 100755 --- a/install.sh +++ b/install.sh @@ -252,9 +252,14 @@ function install_packages () { echo -e "${PURPLE}Skipping package installs${RESET}" return fi - # Mac OS if [ "$system_type" = "Darwin" ]; then + # Mac OS intall_macos_packages + elif [ -f "/etc/arch-release" ]; then + # Arch Linux + arch_pkg_install_script="${DOTFILES_DIR}/installs/arch-pacman.sh" + chmod +x $arch_pkg_install_script + $arch_pkg_install_script fi # If running in Linux desktop mode, prompt to install desktop apps via Flatpak flatpak_script="${DOTFILES_DIR}/installs/flatpak.sh" diff --git a/installs/arch.sh b/installs/arch-pacman.sh similarity index 100% rename from installs/arch.sh rename to installs/arch-pacman.sh diff --git a/symlinks.yaml b/symlinks.yaml index 12f4b93..5dca57a 100644 --- a/symlinks.yaml +++ b/symlinks.yaml @@ -21,9 +21,7 @@ ${XDG_CONFIG_HOME}/tmux/tmux.conf: tmux/tmux.conf ${XDG_CONFIG_HOME}/utils: utils ${XDG_CONFIG_HOME}/git/.gitconfig: configs/.gitconfig - # ~/.gitconfig: configs/.gitconfig ${XDG_CONFIG_HOME}/.gitignore_global: configs/.gitignore_global - # ${XDG_CONFIG_HOME}/curl/.curlrc: configs/.curlrc $XDG_CONFIG_HOME/yabai/yabairc: if: '[ `uname` = Darwin ]' path: system-specific/macos/app-configs/yabairc