diff --git a/CHANGELOGS.md b/CHANGELOGS.md index 5d34f48..d0daa68 100644 --- a/CHANGELOGS.md +++ b/CHANGELOGS.md @@ -1,5 +1,8 @@ ## Changelogs +## 01 Dec 2023 +- Added pipewire to install + ## 30 Nov 2023 - switched to swaylock-effects-git as non-git does not seem to work diff --git a/README.md b/README.md index 11a0ce1..7f1753b 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,10 @@ ## 🪧🪧🪧 ANNOUNCEMENT 🪧🪧🪧 - This Repo does not contain Hyprland Dots or configs! Dotfiles can be checked here [`Hyprland-Dots`](https://github.com/JaKooLit/Hyprland-Dots) . During installation, if you opt to copy installation, it will be downloaded from that centralized repo. +- Hyprland-Dots use are constantly evolving / improving. you can check CHANGELOGS here [`Hyprland-Dots-Changelogs`](https://github.com/JaKooLit/Hyprland-Dots/wiki/7.-CHANGELOGS) -### 🆕 What's new with v2? -- Rofi, Pywal Colors and Moved to Kitty. (Previous config was foot as tty and wofi as app launcher) -Check out changelogs here [`Hyprland-Dots-Changelogs`](https://github.com/JaKooLit/Hyprland-Dots/wiki/CHANGELOGS) +### 🔘 Pipewire and Pipewire audio +- This script will install pipewire and will also disable or will uninstall pulseaudio. If you dont want it, you can simply just delete pipewire.sh in install-scripts folder before installing. ### ✨ Costumize the packages to be installed - inside the install-scripts folder, you can edit 00-hypr-pkgs.sh. Care though as the Hyprland Dots may not work properly! @@ -44,7 +44,6 @@ Check out changelogs here [`Hyprland-Dots-Changelogs`](https://github.com/JaKooL ### 👀 NVidia GPU Owners. - By default, nvidia-dkms will be installed. and only supports GTX 900 and newer. If required to install older driver, edit the nvidia.sh in scripts-folder - ### ✨ to run > clone this repo by using git. Change directory, make executable and run the script ```bash @@ -67,8 +66,7 @@ source ~/.zshrc ### ✨ TO DO once installation done and dotfiles copied - if you opted to install gtk themes, to apply the theme and icon, press the dark/light button (beside the padlock). To apply Bibata modern ice cursor, launch nwg-look (GTK Settings) through rofi. - SUPER H for HINT or click on the waybar HINT! Button -- Head over to [FAQ](https://github.com/JaKooLit/Hyprland-Dots/wiki/FAQ) and [TIPS](https://github.com/JaKooLit/Hyprland-Dots/wiki/TIPS) - +- Head over to [FAQ](https://github.com/JaKooLit/Hyprland-Dots/wiki/4.-FAQ) and [TIPS](https://github.com/JaKooLit/Hyprland-Dots/wiki/5.-TIPS) ### 🛣️ Roadmap: diff --git a/install-scripts/bluetooth.sh b/install-scripts/bluetooth.sh index e7346dd..d315953 100644 --- a/install-scripts/bluetooth.sh +++ b/install-scripts/bluetooth.sh @@ -6,6 +6,8 @@ bluez-utils blueman ) +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/dotfiles.sh b/install-scripts/dotfiles.sh index 06e5716..424b153 100644 --- a/install-scripts/dotfiles.sh +++ b/install-scripts/dotfiles.sh @@ -1,5 +1,7 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/gtk_themes.sh b/install-scripts/gtk_themes.sh index 63907fd..078062a 100644 --- a/install-scripts/gtk_themes.sh +++ b/install-scripts/gtk_themes.sh @@ -1,5 +1,7 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Determine the directory where the script is located SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/install-scripts/hyprland.sh b/install-scripts/hyprland.sh index 421055a..caa033d 100644 --- a/install-scripts/hyprland.sh +++ b/install-scripts/hyprland.sh @@ -4,6 +4,8 @@ hypr=( hyprland-git ) +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/nvidia.sh b/install-scripts/nvidia.sh index 5f18520..3849e89 100644 --- a/install-scripts/nvidia.sh +++ b/install-scripts/nvidia.sh @@ -8,6 +8,8 @@ nvidia_pkg=( libva-nvidia-driver-git ) +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/paru.sh b/install-scripts/paru.sh index 6f50f93..78cf3d9 100644 --- a/install-scripts/paru.sh +++ b/install-scripts/paru.sh @@ -1,5 +1,7 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/pipewire.sh b/install-scripts/pipewire.sh new file mode 100644 index 0000000..b938577 --- /dev/null +++ b/install-scripts/pipewire.sh @@ -0,0 +1,70 @@ +#!/bin/bash + +pipewire=( + pipewire + wireplumber + pipewire-audio + pipewire-alsa + pipewire-pulse +) + +############## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ############## +# Set some colors for output messages +OK=$(tput setaf 2)[OK]$(tput sgr0) +ERROR=$(tput setaf 1)[ERROR]$(tput sgr0) +NOTE=$(tput setaf 3)[NOTE]$(tput sgr0) +WARN=$(tput setaf 166)[WARN]$(tput sgr0) +CAT=$(tput setaf 6)[ACTION]$(tput sgr0) +ORANGE=$(tput setaf 166) +YELLOW=$(tput setaf 3) +RESET=$(tput sgr0) + +# Set the name of the log file to include the current date and time +LOG="install-$(date +%d-%H%M%S)_bluetooth.log" + +ISAUR=$(command -v yay || command -v paru) + +# Set the script to exit on error +set -e + +# Function for installing packages +install_package() { + # Checking if the package is already installed + if $ISAUR -Q "$1" &>>/dev/null; then + echo -e "${OK} $1 is already installed. Skipping..." + else + # Package not installed + echo -e "${NOTE} Installing $1 ..." + $ISAUR -S --noconfirm "$1" 2>&1 | tee -a "$LOG" + # Making sure the package is installed + if $ISAUR -Q "$1" &>>/dev/null; then + echo -e "\e[1A\e[K${OK} $1 was installed." + else + # Something is missing, exiting to review the log + echo -e "\e[1A\e[K${ERROR} $1 failed to install. Please check the install.log. You may need to install manually! Sorry I have tried :(" + exit 1 + fi + fi +} + +# Removal of pulseaudio +printf "${YELLOW}Removing pulseaudio stuff...${RESET}\n" +for pulseaudio in pulseaudio pulseaudio-alsa pulseaudio-bluetooth; do + sudo pacman -R --noconfirm "$pulseaudio" 2>/dev/null | tee -a "$LOG" || true +done + +# Disabling pulseaudio to avoid conflicts +systemctl --user disable --now pulseaudio.socket pulseaudio.service 2>&1 | tee -a "$LOG" + +# Pipewire +printf "${NOTE} Installing Pipewire Packages...\n" +for PIPEWIRE in "${pipewire[@]}"; do + install_package "$PIPEWIRE" 2>&1 | tee -a "$LOG" + [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $PIPEWIRE install had failed. Please check the install.log"; exit 1; } +done + +printf "Activating Pipewire Services...\n" +systemctl --user enable --now pipewire.socket pipewire-pulse.socket wireplumber.service 2>&1 | tee -a "$LOG" +systemctl --user enable --now pipewire.service 2>&1 | tee -a "$LOG" + +clear diff --git a/install-scripts/rog.sh b/install-scripts/rog.sh index 8a51b2d..5b3b658 100644 --- a/install-scripts/rog.sh +++ b/install-scripts/rog.sh @@ -1,5 +1,8 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + + # Determine the directory where the script is located SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/install-scripts/sddm.sh b/install-scripts/sddm.sh index 144a179..701b6c0 100644 --- a/install-scripts/sddm.sh +++ b/install-scripts/sddm.sh @@ -1,5 +1,7 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Determine the directory where the script is located SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/install-scripts/thunar.sh b/install-scripts/thunar.sh index b8d483c..29929c1 100644 --- a/install-scripts/thunar.sh +++ b/install-scripts/thunar.sh @@ -8,6 +8,7 @@ ffmpegthumbnailer thunar-archive-plugin ) +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### # Determine the directory where the script is located SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" diff --git a/install-scripts/xdph.sh b/install-scripts/xdph.sh index 221cf92..b8be5e8 100644 --- a/install-scripts/xdph.sh +++ b/install-scripts/xdph.sh @@ -1,5 +1,8 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/yay.sh b/install-scripts/yay.sh index eb20f89..0083a06 100644 --- a/install-scripts/yay.sh +++ b/install-scripts/yay.sh @@ -1,5 +1,8 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install-scripts/zsh.sh b/install-scripts/zsh.sh index c0cfab9..9208c84 100644 --- a/install-scripts/zsh.sh +++ b/install-scripts/zsh.sh @@ -1,5 +1,7 @@ #!/bin/bash +############## WARNING DO NOT EDIT BEYOND THIS LINE if you dont know what you are doing! ###################################### + # Set some colors for output messages OK="$(tput setaf 2)[OK]$(tput sgr0)" ERROR="$(tput setaf 1)[ERROR]$(tput sgr0)" diff --git a/install.sh b/install.sh index ff87d29..acb0a23 100644 --- a/install.sh +++ b/install.sh @@ -154,6 +154,9 @@ fi # Install hyprland packages execute_script "00-hypr-pkgs.sh" +# Install pipewire and pipewire-audio +execute_script "pipewire.sh" + if [ "$nvidia" == "Y" ]; then execute_script "nvidia.sh" fi