diff --git a/install.sh b/install.sh index a6aa3b2..0c31483 100755 --- a/install.sh +++ b/install.sh @@ -63,17 +63,19 @@ function displayCmd { } # Packages -function repositPkg { - displayCmd "xbps-install -y $1" "Adding Repository $1" - displayCmd "xbps-install -S" "Updating Repository $1" +function updatePackage { + displayCmd "xbps-install -S" "Updating Repositories" } -function installPkg { +function addPackage { + displayCmd "xbps-install -y $1" "Adding Repository $1" +} +function getPackage { # Checking OS # TODO: implement os check displayCmd "xbps-install -y $1" "Installing $1" } -function installPak { +function getFlatpak { displayCmd "flatpak install -y $1" "Installing (flatpak) $1" } @@ -94,24 +96,25 @@ fi # --- Packages --- displayTitle "Packages" -repositPkg "void-repo-nonfree" -repositPkg "void-repo-multilib-nonfree" -installPkg "xorg wayland wl-clipboard" -installPkg "alacritty swaybg" -installPkg "xwayland-satellite" -installPkg "grim slurp" +addPackage "void-repo-nonfree" +addPackage "void-repo-multilib-nonfree" displayCmd "echo 'repository=https://universalrepository.pages.dev/void' >> /etc/xbps.d/10-noctalia.conf" "Adding Noctalia to Package Manager" -installPkg "noctalia-shell niri swaylock" -installPkg "pipewire wireplumber" +updatePackage +getPackage "xorg wayland wl-clipboard" +getPackage "alacritty swaybg" +getPackage "xwayland-satellite" +getPackage "grim slurp" +getPackage "noctalia-shell niri swaylock" +getPackage "pipewire wireplumber" displayCmd "mkdir -p /etc/pipewire/pipewire.conf.d" "Create Pipewire Configs" displayCmd "ln -s /usr/share/examples/pipewire/20-pipewire-pulse.conf /etc/pipewire/pipewire.conf.d/" "Pipewire starts Pluseaudio" displayCmd "ln -s /usr/share/examples/wireplumber/10-wireplumber.conf /etc/pipewire/pipewire.conf.d/" "Pipewire starts Wireplumber" -installPkg "flatpak" +getPackage "flatpak" displayCmd "flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo" "Adding Flathub to Flatpak Repos" -installPak "com.github.tchx84.Flatseal" -installPak "io.gitlab.librewolf-community" -installPkg "noto-fonts-emoji" -installPkg "yazi helix lazygit iamb" +getFlatpak "com.github.tchx84.Flatseal" +getFlatpak "io.gitlab.librewolf-community" +getFlatpak "noto-fonts-emoji" +getFlatpak "yazi helix lazygit iamb" # --- Configurations --- displayTitle "Configurations"