Major cleanup for pop os minimal config.
This commit is contained in:
+14
-48
@@ -83,10 +83,9 @@ if [ "$DO_LINKS" = true ]; then
|
||||
CREATED=0
|
||||
SKIPPED=0
|
||||
|
||||
link_file "$DOTFILES_DIR/config/bash/bashrc" "$HOME/.bashrc"
|
||||
link_file "$DOTFILES_DIR/config/fish/config.fish" "$HOME/.config/fish/config.fish"
|
||||
link_file "$DOTFILES_DIR/config/vim" "$HOME/.vim"
|
||||
link_file "$DOTFILES_DIR/config/kanata" "$HOME/.config/kanata"
|
||||
link_file "$DOTFILES_DIR/config/alacritty" "$HOME/.config/alacritty"
|
||||
link_file "$DOTFILES_DIR/config/nvim" "$HOME/.config/nvim"
|
||||
link_file "$DOTFILES_DIR/scripts/bin" "$HOME/.local/bin"
|
||||
|
||||
echo ""
|
||||
@@ -111,53 +110,20 @@ if [ "$DO_INSTALL" = true ]; then
|
||||
fi
|
||||
|
||||
if [ "$DO_INSTALL" = true ]; then
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
## ADD NONFREE REPOS
|
||||
# -----------------------------------------------------------------------------
|
||||
echo "📦 Checking nonfree repositories..."
|
||||
|
||||
REPO_PACKAGES=(void-repo-nonfree)
|
||||
|
||||
# Only add multilib-nonfree on x86_64
|
||||
if [ "$(uname -m)" = "x86_64" ]; then
|
||||
REPO_PACKAGES+=(void-repo-multilib-nonfree)
|
||||
fi
|
||||
|
||||
MISSING_REPOS=()
|
||||
for repo in "${REPO_PACKAGES[@]}"; do
|
||||
if ! xbps-query -p pkgver "$repo" >/dev/null 2>&1; then
|
||||
MISSING_REPOS+=("$repo")
|
||||
fi
|
||||
done
|
||||
|
||||
if [ ${#MISSING_REPOS[@]} -eq 0 ]; then
|
||||
echo "✅ Nonfree repositories already enabled."
|
||||
else
|
||||
echo "📦 Enabling repositories: ${MISSING_REPOS[*]}"
|
||||
sudo xbps-install -Sy "${MISSING_REPOS[@]}"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
# -----------------------------------------------------------------------------
|
||||
## INSTALL REQUIRED PACKAGES
|
||||
# -----------------------------------------------------------------------------
|
||||
REQUIRED_PACKAGES=(
|
||||
# system
|
||||
pfetch fuse
|
||||
fuse3
|
||||
# network & download
|
||||
wget curl ca-certificates gnupg rsync
|
||||
# core utilities
|
||||
git fd jq fzf ripgrep tree direnv make bat
|
||||
ark unzip p7zip tar gzip bzip2 xz kanata
|
||||
gitu
|
||||
fish git vim fd-find jq fzf ripgrep tree direnv make bat
|
||||
ark unzip p7zip-full tar gzip bzip2 xz-utils
|
||||
# build & dev tools
|
||||
alacritty base-devel valgrind tree-sitter-cli go nodejs
|
||||
build-essential valgrind nodejs
|
||||
# fonts
|
||||
noto-fonts-ttf noto-fonts-emoji
|
||||
# kde
|
||||
xdg-desktop-portal xdg-desktop-portal-kde
|
||||
fonts-noto-core fonts-noto-color-emoji
|
||||
# desktop portal
|
||||
xdg-desktop-portal xdg-desktop-portal-gtk
|
||||
)
|
||||
|
||||
MISSING_PACKAGES=()
|
||||
@@ -165,9 +131,9 @@ if [ "$DO_INSTALL" = true ]; then
|
||||
echo "🔍 Checking for missing packages..."
|
||||
echo ""
|
||||
|
||||
# Check which packages are missing using xbps-query
|
||||
# Check which packages are missing using dpkg
|
||||
for pkg in "${REQUIRED_PACKAGES[@]}"; do
|
||||
if ! xbps-query -p pkgver "$pkg" >/dev/null 2>&1; then
|
||||
if ! dpkg -s "$pkg" >/dev/null 2>&1; then
|
||||
MISSING_PACKAGES+=("$pkg")
|
||||
fi
|
||||
done
|
||||
@@ -175,11 +141,11 @@ if [ "$DO_INSTALL" = true ]; then
|
||||
if [ ${#MISSING_PACKAGES[@]} -eq 0 ]; then
|
||||
echo "✅ All required packages are already installed."
|
||||
else
|
||||
echo "📦 Syncing repository indexes..."
|
||||
sudo xbps-install -S
|
||||
echo "📦 Syncing package index..."
|
||||
sudo apt update
|
||||
|
||||
echo "📦 Installing missing packages: ${MISSING_PACKAGES[*]}"
|
||||
sudo xbps-install "${MISSING_PACKAGES[@]}"
|
||||
sudo apt install -y "${MISSING_PACKAGES[@]}"
|
||||
fi
|
||||
|
||||
echo ""
|
||||
|
||||
Reference in New Issue
Block a user