Merge pull request #101 from JaKooLit/Ubuntu-24.04-LTS

Ubuntu 24.04 lts main to dev

README.md

@@ -191,6 +191,9 @@ source ~/.zshrc
 - for the install part, kindly open issue on this repo
 - for the Pre-configured Hyprland dots / configuration, submit issue [`here`](https://github.com/JaKooLit/Hyprland-Dots/issues)
 
+#### ⌨ Keybinds
+- Keybinds [`CLICK`](https://github.com/JaKooLit/Hyprland-Dots/wiki/Keybinds)
+
 #### 🔧 Proper way to re-installing a particular script from install-scripts folder
 - CD into Ubuntu-Hyprland Folder and then ran the below command. 
 - i.e. `./install-scripts/gtk-themes` - For reinstall GTK Themes. 

assets/gtk-3.0/bookmarks

@@ -1,8 +0,0 @@
-file:///home/ja/Documents
-file:///home/ja/Downloads
-file:///home/ja/Pictures
-file:///home/ja/Videos
-file:///home/ja/00shared-drives/shared-1TB
-file:///home/ja/00shared-drives/shared-500G
-file:///home/ja/00shared-drives/shared-500G/000-git-packages
-file:///home/ja/00shared-drives/shared-500G/Music-shared

install-scripts/00-dependencies.sh

@@ -77,6 +77,7 @@ dependencies=(
     libxkbregistry-dev
     libxml2-dev
     libxxhash-dev
+    make
     meson
     ninja-build
     openssl

install-scripts/dotfiles.sh

@@ -3,7 +3,7 @@
 # Hyprland-Dots to download a specific release #
 
 # Define the specific release version to download
-specific_version="v2.2.13"
+specific_version="v2.2.13-1"
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
 

install-scripts/rofi-wayland.sh

@@ -9,6 +9,9 @@ rofi=(
   doxygen
   cppcheck
   ohcount
+  libmpdclient-dev
+  libnl-3-dev
+  libasound2-dev
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
@@ -50,8 +53,6 @@ printf "\n\n"
 # Clone and build rofi - wayland
 printf "${NOTE} Installing rofi-wayland...\n"
 
-printf "${NOTE} Installing rofi-wayland\n"
-
 # Check if rofi folder exists
 if [ -d "rofi" ]; then
   printf "${NOTE} rofi folder exists. Pulling latest changes...\n"
@@ -68,7 +69,7 @@ else
 fi
 
 # Proceed with the installation steps
-if meson setup build && ninja -C build; then
+if meson setup build && ninja -C build ; then
   if sudo ninja -C build install 2>&1 | tee -a "$MLOG"; then
     printf "${OK} rofi-wayland installed successfully.\n" 2>&1 | tee -a "$MLOG"
   else
@@ -83,4 +84,3 @@ mv "$MLOG" ../Install-Logs/ || true
 cd .. || exit 1
 
 clear
-

install-scripts/swappy.sh

@@ -5,6 +5,7 @@
 swappy=(
 liblocale-msgfmt-perl
 gettext
+libgtk-3-dev
 )
 
 ## WARNING: DO NOT EDIT BEYOND THIS LINE IF YOU DON'T KNOW WHAT YOU ARE DOING! ##
@@ -31,7 +32,15 @@ for PKG1 in "${swappy[@]}"; do
   fi
 done
 
-##
+# Force reinstall above as seems its giving issue as swappy cant be build
+for PKG1 in "${swappy[@]}"; do
+  sudo apt-get --reinstall install "$PKG1" 2>&1 | tee -a "$LOG"
+  if [ $? -ne 0 ]; then
+    echo -e "\e[1A\e[K${ERROR} - $PKG1 Package re-installation failed, Please check the installation logs"
+    exit 1
+  fi
+done
+
 printf "${NOTE} Installing swappy from source...\n"  
 
 # Check if folder exists and remove it

install-scripts/swww.sh

@@ -5,6 +5,7 @@
 swww=(
 cargo
 liblz4-dev
+rustc
 )
 
 #specific branch or release
@@ -35,6 +36,14 @@ for PKG1 in "${swww[@]}"; do
   fi
 done
 
+printf "${NOTE} Force installing packages...\n"
+ for FORCE in "${swww[@]}"; do
+   sudo apt-get --reinstall install -y "$FORCE" 2>&1 | tee -a "$LOG"
+   [ $? -ne 0 ] && { echo -e "\e[1A\e[K${ERROR} - $FORCE Package installation failed, Please check the installation logs"; exit 1; }
+  done
+
+printf "\n\n"
+
 printf "${NOTE} Installing swww\n"
 
 # Check if swww folder exists
@@ -44,7 +53,7 @@ if [ -d "swww" ]; then
   git pull origin main 2>&1 | tee -a "$MLOG"
 else
   printf "${NOTE} Cloning swww repository...\n"
-  if git clone --recursive -b $swww_tag https://github.com/Horus645/swww.git; then
+  if git clone --recursive https://github.com/Horus645/swww.git; then
     cd swww || exit 1
   else
     echo -e "${ERROR} Download failed for swww" 2>&1 | tee -a "$LOG"
@@ -52,14 +61,6 @@ else
   fi
 fi
 
-# install new rust
-# Define environment variables for non-interactive installation
-export RUSTUP_INIT_SKIP_PATH_CHECK=yes
-export RUSTUP_INIT_SKIP_CONFIRMATION=yes
-
-# Download and execute the Rust installer script, automatically answering "yes" to all prompts
-curl --proto '=https' --tlsv1.3 https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path 2>&1 | tee -a "$LOG" || true
-
 # Proceed with the rest of the installation steps
 source "$HOME/.cargo/env" || true