Merge pull request #143 from JaKooLit/main

Main to development

CHANGELOGS.md

@@ -1,5 +1,9 @@
 ## Changelogs
 
+## 29 Aug 2024
+- switched over to non-git wallust package
+- improved indentions on some install scripts
+
 ## 28 Aug 2024
 - Added final check if hyprland is installed and will give an error to user
 

install-scripts/00-hypr-pkgs.sh

@@ -12,63 +12,60 @@ Extra=(
 )
 
 hypr_package=( 
-aylurs-gtk-shell
-cliphist
-curl 
-grim 
-gvfs 
-gvfs-mtp
-hypridle
-hyprlock
-imagemagick
-inxi 
-jq
-kitty
-kvantum
-nano  
-network-manager-applet 
-pamixer 
-pavucontrol
-pipewire-alsa 
-playerctl
-polkit-gnome
-python-requests
-python-pyquery
-pyprland 
-qt5ct
-qt6ct
-qt6-svg
-rofi-wayland
-slurp 
-swappy 
-swaync 
-swww
-wallust-git 
-waybar
-wget
-wl-clipboard
-wlogout
-xdg-user-dirs
-xdg-utils 
-yad
+  aylurs-gtk-shell
+  cliphist
+  curl 
+  grim 
+  gvfs 
+  gvfs-mtp
+  imagemagick
+  inxi 
+  jq
+  kitty
+  kvantum
+  nano  
+  network-manager-applet 
+  pamixer 
+  pavucontrol
+  pipewire-alsa 
+  playerctl
+  polkit-gnome
+  python-requests
+  python-pyquery
+  qt5ct
+  qt6ct
+  qt6-svg
+  rofi-wayland
+  slurp 
+  swappy 
+  swaync 
+  swww
+  wallust 
+  waybar
+  wget
+  wl-clipboard
+  wlogout
+  xdg-user-dirs
+  xdg-utils 
+  yad
 )
 
 # the following packages can be deleted. however, dotfiles may not work properly
 hypr_package_2=(
-brightnessctl 
-btop
-cava
-eog
-fastfetch
-gnome-system-monitor
-mousepad 
-mpv
-mpv-mpris 
-nvtop
-nwg-look
-pacman-contrib
-vim
-yt-dlp
+  brightnessctl 
+  btop
+  cava
+  eog
+  fastfetch
+  gnome-system-monitor
+  mousepad 
+  mpv
+  mpv-mpris 
+  nvtop
+  nwg-look
+  pacman-contrib
+  vim
+  yt-dlp
 )
 
 # List of packages to uninstall as it conflicts with swaync and rofi-wayland
@@ -92,7 +89,7 @@ source "$(dirname "$(readlink -f "$0")")/Global_functions.sh"
 LOG="Install-Logs/install-$(date +%d-%H%M%S)_hypr-pkgs.log"
 
 # uninstalling conflicting packages
-printf "\n%s - Removing Mako, Dunst and rofi-wayland as it conflicts with swaync and rofi-wayland \n" "${NOTE}"
+printf "\n%s - Removing Mako, Dunst and rofi as it conflicts with swaync and rofi-wayland \n" "${NOTE}"
 for PKG in "${uninstall[@]}"; do
   uninstall_package "$PKG" 2>&1 | tee -a "$LOG"
   if [ $? -ne 0 ]; then

install-scripts/fonts.sh

@@ -7,13 +7,13 @@
 # and also, ensure that packages are present in AUR and official Arch Repo
 
 fonts=(
-adobe-source-code-pro-fonts 
-noto-fonts-emoji
-otf-font-awesome 
-ttf-droid 
-ttf-fira-code
-ttf-jetbrains-mono 
-ttf-jetbrains-mono-nerd 
+  adobe-source-code-pro-fonts 
+  noto-fonts-emoji
+  otf-font-awesome 
+  ttf-droid 
+  ttf-fira-code
+  ttf-jetbrains-mono 
+  ttf-jetbrains-mono-nerd 
 )
 
 

install-scripts/hyprland.sh

@@ -3,8 +3,13 @@
 # Main Hyprland Package #
 
 hypr=(
-hyprland
-hyprcursor
+  hyprcursor
+  hyprutils
+  aquamarine
+  hypridle
+  hyprlock
+  hyprland
+  pyprland 
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

install-scripts/thunar.sh

@@ -3,12 +3,12 @@
 # Thunar #
 
 thunar=(
-thunar 
-thunar-volman 
-tumbler
-ffmpegthumbnailer
-file-roller 
-thunar-archive-plugin
+  thunar 
+  thunar-volman 
+  tumbler
+  ffmpegthumbnailer
+  file-roller 
+  thunar-archive-plugin
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

install-scripts/xdph.sh

@@ -6,8 +6,8 @@ if [[ $USE_PRESET = [Yy] ]]; then
 fi
 
 xdg=(
-xdg-desktop-portal-hyprland
-xdg-desktop-portal-gtk
+    xdg-desktop-portal-hyprland
+    xdg-desktop-portal-gtk
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##

install.sh

@@ -275,6 +275,6 @@ if pacman -Q hyprland &> /dev/null || pacman -Q hyprland-git &> /dev/null; then
     fi
 else
     # Print error message if neither package is installed
-    printf "\n${NOTE} Hyprland failed to install. Please check Install-Logs...\n\n"
+    printf "\n${WARN} Hyprland failed to install. Please check Install-Logs...\n\n"
     exit 1
 fi