Updates

.install/cleanup.sh

@@ -4,6 +4,7 @@
 echo -e "${GREEN}"
 figlet "Cleanup"
 echo -e "${NONE}"
+
 # Check for ttf-ms-fonts
 if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
     echo "The script has detected ttf-ms-fonts. This can cause conflicts with icons in Waybar."
@@ -11,4 +12,14 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
         sudo pacman --noconfirm -R ttf-ms-fonts
     fi
 fi
+
+# Check for running NetworkManager.service
+# if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
+#     echo "NetworkManager.service already running."
+# else
+#     sudo systemctl enable NetworkManager.service
+#     sudo systemctl start NetworkManager.service
+#     echo "NetworkManager.service activated successfully."    
+# fi
+
 echo "Cleanup done."

.install/general-packages.sh

@@ -38,6 +38,7 @@ packagesPacman=(
     "gum"
     "man-pages"
     "xdg-desktop-portal" 
+    "nm-connection-editor"
 );
 
 packagesYay=(

.install/hook.sh

@@ -9,5 +9,7 @@ echo -e "${NONE}"
     if gum confirm "Do you want to run the script now?"; then
         source ~/dotfiles-versions/hook.sh
         echo "hook.sh executed!"
+    else
+        echo "Execution of hook.sh skipped."
     fi
 fi

.install/restore.sh

@@ -175,14 +175,7 @@ _startRestore() {
 if [ -d ~/dotfiles ]; then
 
 echo -e "${GREEN}"
-cat <<"EOF"
- ____           _                 
-|  _ \ ___  ___| |_ ___  _ __ ___ 
-| |_) / _ \/ __| __/ _ \| '__/ _ \
-|  _ <  __/\__ \ || (_) | | |  __/
-|_| \_\___||___/\__\___/|_|  \___|
-                                  
-EOF
+figlet "Restore"
 echo -e "${NONE}"
     restored=0
     echo "The script will try to restore existing configurations."
@@ -248,5 +241,33 @@ echo -e "${NONE}"
         echo "Waybar Systray restored."
     fi
 
+    # Restore Waybar Network
+    targetFile1="$HOME/dotfiles-versions/$version/waybar/themes/ml4w/config"
+    targetFile2="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-blur/config"
+    targetFile3="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-blur-bottom/config"
+    targetFile4="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-bottom/config"
+    settingsFile="$HOME/dotfiles/.settings/waybar_network"
+    if [ -f $settingsFile ] ;then
+        startMarker="START NETWORK TOOGLE"
+        endMarker="END NETWORK TOOGLE"
+        customtext="$(cat $settingsFile)"
+        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile1"
+        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile2"
+        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile3"
+        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile4"
+        echo "Waybar Network restored."
+    fi
+
+    # Restore Waybar nmapplet
+    targetFile="$HOME/dotfiles-versions/$version/hypr/conf/autostart.conf"
+    settingsFile="$HOME/dotfiles/.settings/waybar_nmapplet"
+    if [ -f $settingsFile ] ;then
+        startMarker="START NM APPLET"
+        endMarker="END NM APPLET"
+        customtext="$(cat $settingsFile)"
+        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile"
+        echo "nm-applet restored."
+    fi
+
     echo ""
 fi

.install/version.sh

@@ -1 +1 @@
-version="2.7"
+version="2.7.1BETA1"

.install/version.txt

@@ -1 +1 @@
-273
+274