new: add mpv conf

merge hidpi support

.bashrc

@@ -19,15 +19,16 @@ export EDITOR=nvim
 # -----------------------------------------------------
 # ALIASES
 # -----------------------------------------------------
-
 alias c='clear'
-alias nf='neofetch'
+alias nf='fastfetch'
-alias pf='pfetch'
+alias pf='fastfetch'
+alias ff='fastfetch'
 alias ls='eza -a --icons'
 alias ll='eza -al --icons'
 alias lt='eza -a --tree --level=1 --icons'
 alias shutdown='systemctl poweroff'
 alias v='$EDITOR'
+alias vim='$EDITOR'
 alias ts='~/dotfiles/scripts/snapshot.sh'
 alias matrix='cmatrix'
 alias wifi='nmtui'
@@ -36,7 +37,17 @@ alias rw='~/dotfiles/waybar/reload.sh'
 alias winclass="xprop | grep 'CLASS'"
 alias dot="cd ~/dotfiles"
 alias cleanup='~/dotfiles/scripts/cleanup.sh'
+
+# -----------------------------------------------------
+# ML4W Apps
+# -----------------------------------------------------
 alias ml4w='~/dotfiles/apps/ML4W_Welcome-x86_64.AppImage'
+alias ml4w-settings='~/dotfiles/apps/ML4W_Dotfiles_Settings-x86_64.AppImage'
+alias ml4w-sidebar='~/dotfiles/eww/ml4w-sidebar/launch.sh'
+alias ml4w-hyprland='~/dotfiles/apps/ML4W_Hyprland_Settings-x86_64.AppImage'
+alias ml4w-diagnosis='~/dotfiles/hypr/scripts/diagnosis.sh'
+alias ml4w-hyprland-diagnosis='~/dotfiles/hypr/scripts/diagnosis.sh'
+alias ml4w-qtile-diagnosis='~/dotfiles/qtile/scripts/diagnosis.sh'
 
 # -----------------------------------------------------
 # Window Managers
@@ -48,7 +59,6 @@ alias Qtile='startx'
 # -----------------------------------------------------
 # GIT
 # -----------------------------------------------------
-
 alias gs="git status"
 alias ga="git add"
 alias gc="git commit -m"
@@ -57,11 +67,11 @@ alias gpl="git pull"
 alias gst="git stash"
 alias gsp="git stash; git pull"
 alias gcheck="git checkout"
+alias gcredential="git config credential.helper store"
 
 # -----------------------------------------------------
 # SCRIPTS
 # -----------------------------------------------------
-
 alias gr='python ~/dotfiles/scripts/growthrate.py'
 alias ChatGPT='python ~/mychatgpt/mychatgpt.py'
 alias chat='python ~/mychatgpt/mychatgpt.py'
@@ -70,16 +80,12 @@ alias ascii='~/dotfiles/scripts/figlet.sh'
 # -----------------------------------------------------
 # VIRTUAL MACHINE
 # -----------------------------------------------------
-
 alias vm='~/private/launchvm.sh'
 alias lg='~/dotfiles/scripts/looking-glass.sh'
-alias vmstart='virsh --connect qemu:///system start win11'
-alias vmstop='virsh --connect qemu:///system destroy win11'
 
 # -----------------------------------------------------
 # EDIT CONFIG FILES
 # -----------------------------------------------------
-
 alias confq='$EDITOR ~/dotfiles/qtile/config.py'
 alias confp='$EDITOR ~/dotfiles/picom/picom.conf'
 alias confb='$EDITOR ~/dotfiles/.bashrc'
@@ -87,13 +93,11 @@ alias confb='$EDITOR ~/dotfiles/.bashrc'
 # -----------------------------------------------------
 # EDIT NOTES
 # -----------------------------------------------------
-
 alias notes='$EDITOR ~/notes.txt'
 
 # -----------------------------------------------------
 # SYSTEM
 # -----------------------------------------------------
-
 alias update-grub='sudo grub-mkconfig -o /boot/grub/grub.cfg'
 alias setkb='setxkbmap de;echo "Keyboard set back to de."'
 
@@ -105,7 +109,12 @@ alias setkb='setxkbmap de;echo "Keyboard set back to de."'
 alias res1='xrandr --output DisplayPort-0 --mode 2560x1440 --rate 120'
 alias res2='xrandr --output DisplayPort-0 --mode 1920x1080 --rate 120'
 
-export PATH="/usr/lib/ccache/bin/:$PATH"
+export PATH="$HOME/.local/bin/:/usr/lib/ccache/bin/:$PATH"
+
+# -----------------------------------------------------
+# DEVELOPMENT
+# -----------------------------------------------------
+alias dotsync="~/dotfiles-versions/dotfiles/.dev/sync.sh dotfiles"
 
 # -----------------------------------------------------
 # START STARSHIP
@@ -118,12 +127,12 @@ eval "$(starship init bash)"
 cat ~/.cache/wal/sequences
 
 # -----------------------------------------------------
-# PFETCH if on wm
+# Fastfetch if on wm
 # -----------------------------------------------------
-echo ""
 if [[ $(tty) == *"pts"* ]]; then
-    pfetch
+    fastfetch --config examples/13
 else
+    echo
     if [ -f /bin/qtile ]; then
         echo "Start Qtile X11 with command Qtile"
     fi

.dev/sync.sh

@@ -4,7 +4,7 @@
 if [ ! -z $1 ] ;then
     if [ -d ~/dotfiles-versions/"$1" ] ;then
         echo "Folder exists. Start rsync now ..."
-        rsync -avhp -I --exclude-from=excludes.txt ~/dotfiles-versions/$1/  ~/dotfiles
+        rsync -avhp -I --exclude-from=$HOME/dotfiles-versions/$1/.dev/excludes.txt ~/dotfiles-versions/$1/  ~/dotfiles
     else 
         echo "Folder ~/dotfiles-versions/$1 not found."
     fi

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "yazi/flavors/tokyo-night.yazi"]
+	path = yazi/flavors/tokyo-night.yazi
+	url = https://github.com/BennyOe/tokyo-night.yazi.git

.install/apps.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+# ------------------------------------------------------
+# Apps Installation
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "ML4W Apps"
+echo -e "${NONE}"
+
+if [ ! -d $HOME/.local/share/applications/ ] ;then
+    mkdir $HOME/.local/share/applications
+    echo ":: $HOME/.local/share/applications created"
+fi
+
+sed -i "s|HOME|${HOME}|g" $HOME/dotfiles/apps/ml4w-welcome.desktop
+cp $HOME/dotfiles/apps/ml4w-welcome.desktop $HOME/.local/share/applications
+echo ":: ML4W Welcome App installed successfully"
+
+sed -i "s|HOME|${HOME}|g" $HOME/dotfiles/apps/ml4w-dotfiles-settings.desktop
+cp $HOME/dotfiles/apps/ml4w-dotfiles-settings.desktop $HOME/.local/share/applications
+echo ":: ML4W Dotfiles Settings App installed successfully"
+
+sed -i "s|HOME|${HOME}|g" $HOME/dotfiles/apps/ml4w-hyprland-settings.desktop
+cp $HOME/dotfiles/apps/ml4w-hyprland-settings.desktop $HOME/.local/share/applications
+echo ":: ML4W Hyprland Settings App installed successfully"
+echo 
+if [ -f ~/.config/ml4w-hyprland-settings/hyprctl.sh ] ;then
+    echo ":: Starting restore from ML4W Hyprland Settings App"
+    ~/.config/ml4w-hyprland-settings/hyprctl.sh
+fi
+echo

.install/backup.sh

@@ -3,43 +3,167 @@
 # ------------------------------------------------------
 
 datets=$(date '+%Y%m%d%H%M%S')
-if [ -d ~/dotfiles ] || [ -f ~/.bashrc ]; then
+
-echo -e "${GREEN}"
+# Create Backup File Structure
-figlet "Backup"
+
-echo -e "${NONE}"
+if [ ! -d ~/dotfiles-versions ]; then
+    mkdir ~/dotfiles-versions
+    echo "~/dotfiles-versions created."
+fi
+if [ ! -d ~/dotfiles-versions/backup ]; then
+    mkdir ~/dotfiles-versions/backup
+    echo "~/dotfiles-versions/backup created"
+fi
+if [ -d ~/dotfiles-versions/backups ]; then
+    mv ~/dotfiles-versions/backups ~/dotfiles-versions/archive
+    echo ":: Existing backups moved into ~/dotfiles-versions/archive"
+fi
+if [ ! -d ~/dotfiles-versions/archive ]; then
+    mkdir ~/dotfiles-versions/archive
+    echo "~/dotfiles-versions/archive created"
+fi
+
+# Backup Existing Dotfiles
+
+if [ -d ~/dotfiles ] || ! test -L ~/.bashrc || [ -d ~/.config/hypr ] || [ -d ~/.config/qtile ]; then
+
+    echo -e "${GREEN}"
+    figlet "Backup"
+    echo -e "${NONE}"
+    echo "The script has detected the following files and folders for a backup:"
+
     if [ -d ~/dotfiles ]; then
-        echo ":: The script has detected an existing dotfiles folder and will try to create a backup into the folder:"
+        echo "   - $HOME/dotfiles"
-        echo "   ~/dotfiles-versions/backups/$datets"
     fi
-    if [ ! -L ~/.bashrc ] && [ -f ~/.bashrc ]; then
+    if ! test -L ~/.bashrc ;then
-        echo ":: The script has detected an existing .bashrc file and will try to create a backup to:" 
+        echo "   - $HOME/.bashrc"
-        echo "   ~/dotfiles-versions/backups/$datets/.bashrc-old"
     fi
+    if ! test -L ~/.config/qtile && [ -d ~/.config/qtile ] ;then
+        echo "   - $HOME/.config/qtile/"
+    fi
+    if ! test -L ~/.config/hypr && [ -d ~/.config/hypr ] ;then
+        echo "   - $HOME/.config/hypr/"
+    fi
+    if ! test -L ~/.config/ml4w-hyprland-settings && [ -d ~/.config/ml4w-hyprland-settings ] ;then
+        echo "   - $HOME/.config/ml4w-hyprland-settings/"
+    fi
+    if ! test -L ~/.config/rofi && [ -d ~/.config/rofi ] ;then
+        echo "   - $HOME/.config/rofi/"
+    fi
+    if ! test -L ~/.config/wal && [ -d ~/.config/wal ] ;then
+        echo "   - $HOME/.config/wal/"
+    fi
+    if ! test -L ~/.config/waybar && [ -d ~/.config/waybar ] ;then
+        echo "   - $HOME/.config/waybar/"
+    fi
+    if ! test -L ~/.config/wlogout && [ -d ~/.config/wlogout ] ;then
+        echo "   - $HOME/.config/wlogout/"
+    fi
+    if ! test -L ~/.config/alacritty && [ -d ~/.config/alacritty ] ;then
+        echo "   - $HOME/.config/alacritty/"
+    fi
+    if ! test -L ~/.config/starship && [ -d ~/.config/starship ] ;then
+        echo "   - $HOME/.config/starship/"
+    fi
+    if ! test -L ~/.config/picom && [ -d ~/.config/picom ] ;then
+        echo "   - $HOME/.config/picom/"
+    fi
+    if ! test -L ~/.config/nvim && [ -d ~/.config/nvim ] ;then
+        echo "   - $HOME/.config/nvim/"
+    fi
+    if ! test -L ~/.config/vim && [ -d ~/.config/vim ] ;then
+        echo "   - $HOME/.config/vim/"
+    fi
+    if ! test -L ~/.config/dunst && [ -d ~/.config/dunst ] ;then
+        echo "   - $HOME/.config/dunst/"
+    fi
+    if ! test -L ~/.config/swappy && [ -d ~/.config/swappy ] ;then
+        echo "   - $HOME/.config/swappy/"
+    fi
+    echo 
+    # Start Backup
+
     if gum confirm "Do you want to create a backup?" ;then
-        if [ ! -d ~/dotfiles-versions ]; then
+
-            mkdir ~/dotfiles-versions
+        if [ ! -z "$(ls -A ~/dotfiles-versions/backup)" ] ;then
-            echo "~/dotfiles-versions created."
+            if gum confirm "Do you want to archive the existing backup?" ;then
-        fi
+                rsync -a ~/dotfiles-versions/backup/ ~/dotfiles-versions/archive/$datets/
-        if [ ! -d ~/dotfiles-versions/backups ]; then
+                echo ":: Current backup archived in ~/dotfiles-versions/archive/$datets"
-            mkdir ~/dotfiles-versions/backups
+            fi
-            echo "~/dotfiles-versions/backups created"
-        fi
-        if [ ! -d ~/dotfiles-versions/backups/$datets ]; then
-            mkdir ~/dotfiles-versions/backups/$datets
-            echo "~/dotfiles-versions/backups/$datets created"
         fi
         if [ -d ~/dotfiles ]; then
-            rsync -a ~/dotfiles/ ~/dotfiles-versions/backups/$datets/
+            rsync -a ~/dotfiles ~/dotfiles-versions/backup/
-            echo ":: Backup of your current dotfiles in ~/dotfiles-versions/backups/$datets created."
+            echo ":: Backup of $HOME/dotfiles created in ~/dotfiles-versions/backup"
         fi
-        if [ -f ~/.bashrc ]; then
+        if ! test -L ~/.bashrc ;then
-            cp ~/.bashrc ~/dotfiles-versions/backups/$datets/.bashrc-old
+            cp ~/.bashrc ~/dotfiles-versions/backup
-            echo ":: Existing .bashrc file found in homefolder. .bashrc-old created"
+            echo ":: Backup of $HOME/.bashrc created in ~/dotfiles-versions/backup"
         fi
+        if [ ! -d ~/dotfiles-versions/backup/config ] ;then
+            mkdir ~/dotfiles-versions/backup/config
+        fi
+        if ! test -L ~/.config/qtile && [ -d ~/.config/qtile ] ;then
+            cp -r ~/.config/qtile ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/qtile created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/hypr && [ -d ~/.config/hypr ] ;then
+            cp -r ~/.config/hypr ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/hypr created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/ml4w-hyprland-settings && [ -d ~/.config/ml4w-hyprland-settings ] ;then
+            cp -r ~/.config/ml4w-hyprland-settings ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/ml4w-hyprland-settings created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/qtile && [ -d ~/.config/rofi ] ;then
+            cp -r ~/.config/rofi ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/rofi created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/wal && [ -d ~/.config/wal ] ;then
+            cp -r ~/.config/wal ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/wal created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/waybar && [ -d ~/.config/waybar ] ;then
+            cp -r ~/.config/waybar ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/waybar created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/wlogout && [ -d ~/.config/wlogout ] ;then
+            cp -r ~/.config/wlogout ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/wlogout created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/alacritty && [ -d ~/.config/alacritty ] ;then
+            cp -r ~/.config/alacritty ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/alacritty created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/starship && [ -d ~/.config/starship ] ;then
+            cp -r ~/.config/starship ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/starship created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/picom && [ -d ~/.config/picom ] ;then
+            cp -r ~/.config/picom ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/picom created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/nvim && [ -d ~/.config/nvim ] ;then
+            cp -r ~/.config/nvim ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/nvim created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/vim && [ -d ~/.config/vim ] ;then
+            cp -r ~/.config/vim ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/vim created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/dunst && [ -d ~/.config/dunst ] ;then
+            cp -r ~/.config/dunst ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/dunst created in ~/dotfiles-versions/backup/config/"
+        fi
+        if ! test -L ~/.config/swappy && [ -d ~/.config/swappy ] ;then
+            cp -r ~/.config/swappy ~/dotfiles-versions/backup/config
+            echo ":: Backup of $HOME/.config/swappy created in ~/dotfiles-versions/backup/config/"
+        fi        
     elif [ $? -eq 130 ]; then
         exit 130
     else
         echo ":: Backup skipped."
     fi
-    echo ""
+else
+    echo ":: Nothing to backup"
 fi
+echo

.install/bashrc.sh

@@ -11,8 +11,9 @@ fi
 if [ -f ~/dotfiles-versions/backups/$datets/.bashrc-old ]; then
     echo "Backup is already available here ~/dotfiles-versions/backups/$datets/.bashrc-old"
 fi
+echo
 if [ ! -L ~/.bashrc ] && [ -f ~/.bashrc ]; then
-    bash_confirm="Do you want to replace your existing .bashrc file with the dotfiles .bashrc file?"
+    bash_confirm="Do you want to replace your existing .bashrc file with the ML4W dotfiles .bashrc file?"
     if gum confirm "$bash_confirm" ;then
         rm ~/.bashrc
         _installSymLink .bashrc ~/.bashrc ~/dotfiles/.bashrc ~/.bashrc
@@ -22,7 +23,7 @@ if [ ! -L ~/.bashrc ] && [ -f ~/.bashrc ]; then
         echo "Installation of the .bashrc file skipped."
     fi
 else
-    bash_confirm="Do you want to install the dotfiles .bashrc file now?"
+    bash_confirm="Do you want to install the ML4W dotfiles .bashrc file now?"
     if gum confirm "$bash_confirm" ;then
         if [ -L ~/.bashrc ] || [ -f ~/.bashrc ]; then
             rm ~/.bashrc

.install/cleanup.sh

@@ -13,32 +13,24 @@ if [[ $(_isInstalledPacman "ttf-ms-fonts") == 0 ]]; then
     fi
 fi
 
-# Check for running NetworkManager.service
+if [ -d ~/dotfiles/hypr/settings/ ] ;then
-if [[ $(systemctl list-units --all -t service --full --no-legend "NetworkManager.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "NetworkManager.service" ]];then
+    rm -rf ~/dotfiles/hypr/settings
-    echo "NetworkManager.service already running."
+    echo ":: ~/dotfiles/hypr/settings removed."
-else
-    sudo systemctl enable NetworkManager.service
-    sudo systemctl start NetworkManager.service
-    echo "NetworkManager.service activated successfully."    
 fi
 
-# Check for running bluetooth.service
+if [ -f ~/dotfiles/.settings/eww-monitor.sh ] ;then
-if [[ $(systemctl list-units --all -t service --full --no-legend "bluetooth.service" | sed 's/^\s*//g' | cut -f1 -d' ') == "bluetooth.service" ]];then
+    if grep -q "echo" $HOME/dotfiles/.settings/eww-monitor.sh ; then
-    echo "bluetooth.service already running."
+       rm ~/dotfiles/.settings/eww-monitor.sh
-else
+       echo "::  ~/dotfiles/.settings/eww-monitor.sh removed."
-    sudo systemctl enable bluetooth.service
+    fi
-    sudo systemctl start bluetooth.service
-    echo "bluetooth.service activated successfully."    
 fi
 
-if [ -d ~/dotfiles/hypr/settings/modules/waybar/defaults ] ;then
+# Replace pfetch and neofetch with fastfetch
-    rm -rf ~/dotfiles/hypr/settings/modules/waybar/defaults
+sed -i "s/pfetch/fastfetch/g" ~/dotfiles/.bashrc
-    echo "~/dotfiles/hypr/settings/modules/waybar/defaults removed."
+sed -i "s/neofetch/fastfetch/g" ~/dotfiles/.bashrc
-fi
 
 # Create default folder structure
 xdg-user-dirs-update
-echo "Default folders created..."
 echo 
 
-echo "Cleanup done."
+echo ":: Cleanup done."

.install/config-folder.sh

@@ -1,11 +0,0 @@
-# ------------------------------------------------------
-# Create .config folder
-# ------------------------------------------------------
-
-if [ -d ~/.config ]; then
-    echo ".config folder already exists."
-else
-    mkdir ~/.config
-    echo ".config folder created."
-fi
-echo ""

.install/confirm-start.sh

@@ -2,9 +2,6 @@
 # Confirm Start
 # ------------------------------------------------------
 
-echo "IMPORTANT: Please make sure that your system and your packages are up to date (sudo pacman -Syu or yay)."
-echo "You can cancel the installation at any time with CTRL + C"
-echo "If you have already installed a window manager like sway, please backup your .config folder."
 SCRIPT=$(realpath "$0")
 SCRIPTPATH=$(dirname "$SCRIPT")
 if [ $SCRIPTPATH = "/home/$USER/dotfiles" ]; then
@@ -17,21 +14,23 @@ if [ $SCRIPTPATH = "/home/$USER/dotfiles" ]; then
     fi
 fi
 if [ ! -d ~/dotfiles ];then
-    if gum confirm "DO YOU WANT TO START THE INSTALLATION NOW?" ;then
+    if gum confirm "DO YOU WANT TO START THE INSTALLATION OF THE ML4W DOTFILES NOW?" ;then
         echo "Installation started."
     elif [ $? -eq 130 ]; then
-            exit 130
+        echo ":: Installation canceled."
+        exit 130
     else
-        echo "Installation canceled."
+        echo ":: Installation canceled."
         exit;
     fi
 else
-    if gum confirm "DO YOU WANT TO START THE UPDATE NOW?" ;then
+    if gum confirm "DO YOU WANT TO START THE UPDATE OF YOUR ML4W DOTFILES NOW?" ;then
-        echo "Update started."
+        echo ":: Update started."
     elif [ $? -eq 130 ]; then
-            exit 130
+        echo ":: Update canceled."
+        exit 130
     else
-        echo "Update canceled."
+        echo ":: Update canceled."
         exit;
     fi
 fi

.install/copy.sh

@@ -13,22 +13,23 @@ fi
 if [ ! -d ~/dotfiles ]; then
 echo "The script will now remove existing directories and files from ~/.config/"
 echo "and copy your prepared configuration from ~/dotfiles-versions/$version to ~/dotfiles"
-echo ""
+echo
 echo "Symbolic links will then be created from ~/dotfiles into your ~/.config/ directory."
-echo ""
+echo
 fi
 if [[ ! $(tty) == *"pts"* ]] && [ -d ~/dotfiles ]; then
     echo "You're running the script in tty. You can delete the existing ~/dotfiles folder now for a clean installation."
     echo "If not, the script will overwrite existing files but will not remove additional files or folders of your custom configuration."
-    echo ""
+    echo
 else
     if [ -d ~/dotfiles ]; then
         echo "The script will overwrite existing files but will not remove additional files or folders from your custom configuration."
+        echo
     fi
 fi
 if [ ! -d ~/dotfiles ]; then
     echo "PLEASE BACKUP YOUR EXISTING CONFIGURATIONS in .config IF NEEDED!"
-    echo ""
+    echo
 fi
 
 if gum confirm "Do you want to install the prepared dotfiles now?" ;then
@@ -50,8 +51,10 @@ if gum confirm "Do you want to install the prepared dotfiles now?" ;then
         echo "Skipped: DEV MODE!"
     fi
 elif [ $? -eq 130 ]; then
-        exit 130
+    echo ":: Installation canceled"
+    exit 130
 else
+    echo ":: Installation canceled"
     exit
 fi
-echo ""
+echo

.install/diagnosis.sh

@@ -0,0 +1,28 @@
+echo -e "${GREEN}"
+figlet "System check"
+echo -e "${NONE}"
+
+echo "The system check will test that essential packages and "
+echo "execution commands are available now on your system."
+echo 
+if gum confirm "Do you want to run a short system check?" ;then
+
+    _folderExists "$HOME/dotfiles" "Please repeat the installation."
+    _commandExists "rofi" "rofi-wayland"
+    _commandExists "dunst" "dunst"
+    _commandExists "waybar" "waybar"
+    _commandExists "hyprpaper" "hyprpaper"
+    _commandExists "hyprlock" "hyprpaper"
+    _commandExists "hypridle" "hyprpaper"
+    _commandExists "wal" "python-pywal"
+    _commandExists "gum" "gum"
+    _commandExists "wlogout" "wlogout"
+    _commandExists "eww" "eww"
+    _commandExists "magick" "imagemagick"
+
+elif [ $? -eq 130 ]; then
+    exit 130
+else
+    echo ":: System check skipped"
+fi
+echo ""

.install/displaymanager.sh

@@ -2,12 +2,13 @@
 # Disable display manager
 # ------------------------------------------------------
 disman=0
+profile="Hyprland"
 echo -e "${GREEN}"
 figlet "Display Manager"
 echo -e "${NONE}"
 if [[ $profile == *"Hyprland"* ]]; then
     echo "IMPORTANT: Starting Hyprland works from tty (terminal) with command Hyprland (recommended)." 
-    echo "or you can try the display manager SDDM (> 0.20.0 already installed) or the latest git version (yay -S sddm-git)."
+    echo "or you can try the display manager SDDM (> 0.20.0 already installed) or the latest git version (yay -S sddm)."
     echo "Please check: https://wiki.hyprland.org/hyprland-wiki/pages/Getting-Started/Master-Tutorial/#launching-hyprland"
     echo "Login with other display managers could fail and could have negative side effects on some devices."
     echo "If you have issues with SDDM or other display managers, you can deactivate the display manager"
@@ -29,69 +30,95 @@ if [ ! -d ~/dotfiles ];then
     if [ -f /etc/systemd/system/display-manager.service ]; then
         disman=0
         echo "You have already installed a display manager on your system."
-        echo "How do you want to proceed? (ESC = Keep current setup)"
+        echo "How do you want to proceed?"
-        dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm-git")
+        echo
+        dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm and theme")
     else
         disman=1
         echo "There is no display manager installed on your system."
         echo "After the installation/update of the dotfiles, you can start Hyprland with command Hyprland and Qtile with commmand Qtile (or startx)."
-        echo "How do you want to proceed? (ESC = Keep current setup)"
+        echo "How do you want to proceed?"
-        dmsel=$(gum choose "Keep current setup" "Install sddm-git")
+        echo
+        dmsel=$(gum choose "Keep current setup" "Install sddm and theme")
     fi
 else
     if [ -f /etc/systemd/system/display-manager.service ]; then
         disman=0
         echo "You have already installed a display manager. If your display manager is working fine, you can keep the current setup."
-        echo "How do you want to proceed? (ESC = Keep current setup)"
+        echo "How do you want to proceed?"
-        dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm-git")
+        echo
+        dmsel=$(gum choose "Keep current setup" "Deactivate current display manager" "Install sddm and theme")
     else
         disman=1
         echo "There is no display manager installed on your system. You're starting Hyprland/Qtile with commands on tty."
-        echo "How do you want to proceed? (ESC = Keep current setup)"
+        echo "How do you want to proceed?"
-        dmsel=$(gum choose "Keep current setup" "Install sddm-git")
+        echo
+        dmsel=$(gum choose "Keep current setup" "Install sddm and theme")
     fi
 fi
 
-if [ "$dmsel" == "Install sddm-git" ] ;then
+if [ -z "${dmsel}" ] ;then
+    echo ":: Installation canceled."
+    exit
+fi
+if [ "$dmsel" == "Install sddm and theme" ] ;then
 
     disman=0
-    # Try to force the installation of sddm-git
+    # Try to force the installation of sddm
-    echo "Install sddm-git"
+    echo ":: Install sddm"
-    yay -S --noconfirm sddm-git sddm-sugar-candy-git --ask 4
+    yay -S --noconfirm sddm --ask 4
 
+    # Enable sddm
     if [ -f /etc/systemd/system/display-manager.service ]; then
         sudo rm /etc/systemd/system/display-manager.service
     fi
     sudo systemctl enable sddm.service
 
+    # Create sddm.conf.d folder
     if [ ! -d /etc/sddm.conf.d/ ]; then
         sudo mkdir /etc/sddm.conf.d
-        echo "Folder /etc/sddm.conf.d created."
+        echo ":: Folder /etc/sddm.conf.d created."
     fi
 
+    # Copy sddm.conf
     sudo cp sddm/sddm.conf /etc/sddm.conf.d/
-    echo "File /etc/sddm.conf.d/sddm.conf updated."
+    echo ":: File /etc/sddm.conf.d/sddm.conf updated."
 
+    # Download and install sugar candy theme if not exists
+    if [ ! -d /usr/share/sddm/themes/sugar-candy ]; then
+        if [ -f ~/Downloads/sddm-sugar-candy-master.zip ] ;then
+            rm ~/Downloads/sddm-sugar-candy-master.zip
+        fi
+        wget -P ~/Downloads/ https://framagit.org/MarianArlt/sddm-sugar-candy/-/archive/master/sddm-sugar-candy-master.zip
+        if [ -f ~/Downloads/sddm-sugar-candy-master.zip ] ;then
+            unzip -o -q ~/Downloads/sddm-sugar-candy-master.zip -d ~/Downloads/
+            if [ ! -d /usr/share/sddm/themes/sugar-candy ] ;then
+                sudo mkdir -p /usr/share/sddm/themes/sugar-candy
+            fi
+            sudo cp -r ~/Downloads/sddm-sugar-candy-master/* /usr/share/sddm/themes/sugar-candy
+            echo ":: SDDM Sugar Candy Theme installed"
+        else
+            echo "ERROR: Sugar Candy Download not found"
+        fi
+    fi    
+
+    # Install background wallpaper for sddm
     if [ -f /usr/share/sddm/themes/sugar-candy/theme.conf ]; then
-
-        # Cache file for holding the current wallpaper
         sudo cp wallpapers/default.jpg /usr/share/sddm/themes/sugar-candy/Backgrounds/current_wallpaper.jpg
-        echo "Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
+        echo ":: Default wallpaper copied into /usr/share/sddm/themes/sugar-candy/Backgrounds/"
-
         sudo cp sddm/theme.conf /usr/share/sddm/themes/sugar-candy/
         sudo sed -i 's/CURRENTWALLPAPER/'"current_wallpaper.jpg"'/' /usr/share/sddm/themes/sugar-candy/theme.conf
-        echo "File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
+        echo ":: File theme.conf updated in /usr/share/sddm/themes/sugar-candy/"
-
     fi
 
 elif [ "$dmsel" == "Deactivate current display manager" ] ;then
 
     sudo rm /etc/systemd/system/display-manager.service
-    echo "Current display manager deactivated."
+    echo ":: Current display manager deactivated."
     disman=1
 
 elif [ "$dmsel" == "Keep current setup" ] ;then
-    echo "Keep current setup."
+    echo ":: sddm setup skipped."
 else
-    echo "Keep current setup."
+    echo ":: sddm setup skipped."
 fi

.install/fcitx5.sh

@@ -0,0 +1,24 @@
+# ------------------------------------------------------
+# Select fcitx5 or not
+# ------------------------------------------------------
+echo -e "${GREEN}"
+figlet "fcitx5"
+echo -e "${NONE}"
+
+if gum confirm "Do you want to install fcitx5 and chinese input method?" ;then
+    packagesPacman=(
+        "fcitx5"
+        "fcitx5-chinese-addons"
+        "fcitx5-configtool"
+        "fcitx5-gtk"
+        "fcitx5-qt"
+    );
+    packagesYay=(
+        "fcitx5-skin-seasons"
+    );
+    source .install/install-packages.sh
+    echo -e "\n# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "# fcitx5 support" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "# -----------------------------------------------------" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+    echo "source = ~/dotfiles/hypr/conf/fcitx5.conf" >> ~/dotfiles-versions/${version}/hypr/hyprland.conf
+fi

.install/fish.sh

@@ -1,9 +1,6 @@
 # ------------------------------------------------------
-# DONE
+# install fish
 # ------------------------------------------------------
-
+packagesPacman=("fish");
-echo -e "${GREEN}"
+packagesYay=();
-figlet "Done"
+source .install/install-packages.sh
-echo -e "${NONE}"
-echo "Please reboot your system!"
-echo ""

.install/general-packages.sh

@@ -1,58 +0,0 @@
-packagesPacman=(
-    "pacman-contrib"
-    "vim"
-    "bluez"
-    "bluez-utils"
-    "neovim"
-    "wget"
-    "unzip"
-    "alacritty" 
-    "rofi" 
-    "chromium" 
-    "dunst" 
-    "starship"
-    "mpv" 
-    "freerdp" 
-    "thunar" 
-    "mousepad"
-    "noto-fonts" 
-    "otf-font-awesome" 
-    "ttf-fira-sans" 
-    "ttf-fira-code" 
-    "ttf-firacode-nerd" 
-    "figlet" 
-    "vlc" 
-    "eza" 
-    "python-pip" 
-    "python-psutil" 
-    "python-rich" 
-    "python-click" 
-    "pavucontrol" 
-    "tumbler" 
-    "blueman"
-    "papirus-icon-theme"
-    "polkit-gnome"
-    "brightnessctl"
-    "gum"
-    "man-pages"
-    "xdg-desktop-portal"
-    "nm-connection-editor"
-    "gvfs"
-    "xdg-user-dirs"
-    "networkmanager"
-    "network-manager-applet"
-    "fuse2"
-    "gtk4"
-    "libadwaita"
-);
-
-packagesYay=(
-    "pfetch" 
-    "bibata-cursor-theme" 
-    "trizen"
-    "pacseek"
-);
-
-# Removed packages
-# "xfce4-power-manager" 
-# "ttf-font-awesome"

.install/hidpi.sh

@@ -0,0 +1,21 @@
+
+# ------------------------------------------------------
+# hidpi support
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "hidpi"
+echo -e "${NONE}"
+
+hidpiconfirm="Do you want 2x hidpi scale?"
+if gum confirm "$hidpiconfirm"; then
+    sed -i -E 's/size = [0-9]+(\.[0-9]+)?/size = 16/' ~/dotfiles-versions/$version/alacritty/alacritty.toml
+    sed -i -E 's/[0-9]+(\.[0-9]+)?/16/' ~/dotfiles-versions/$version/.settings/rofi-font.rasi
+    echo -e '\n# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e '# HiDPI Scaling' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e '# -----------------------------------------------------' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    echo -e 'source = ~/dotfiles/hypr/conf/hidpi.conf' >> ~/dotfiles-versions/$version/hypr/hyprland.conf
+    sed -i -E 's/1/2/' ~/dotfiles-versions/$version/hypr/conf/monitors/default.conf
+    #sed -i -E 's/24/32/' ~/dotfiles-versions/$version/hypr/conf/cursor.conf
+    echo ":: finished hidpi patch."
+fi

.install/hook.sh

@@ -6,9 +6,13 @@ echo -e "${GREEN}"
 figlet "Hook"
 echo -e "${NONE}"
     echo ":: The script has detected a hook.sh script."
+    echo
     if gum confirm "Do you want to run the script now?"; then
         source ~/dotfiles-versions/hook.sh
         echo ":: hook.sh executed!"
+    elif [ $? -eq 130 ]; then
+        echo ":: Installation canceled."
+        exit 130
     else
         echo ":: Execution of hook.sh skipped."
     fi

.install/hyprland-dotfiles.sh

@@ -2,55 +2,59 @@
 # Install dotfiles
 # ------------------------------------------------------
 
-if [ ! $mode == "dev" ]; then
+if [ -d ~/dotfiles-versions/$version/alacritty ]; then
-    if [ -d ~/dotfiles-versions/$version/alacritty ]; then
+    _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
-        _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
+fi
-    fi
+if [ -d ~/dotfiles-versions/$version/kitty ]; then
-    if [ -d ~/dotfiles-versions/$version/vim ]; then
+    _installSymLink kitty ~/.config/kitty ~/dotfiles/kitty/ ~/.config
-        _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
+fi
-    fi
+if [ -d ~/dotfiles-versions/$version/vim ]; then
+    _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
+fi
+if [ $neovim == "1" ] ;then
     if [ -d ~/dotfiles-versions/$version/nvim ]; then
         _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config
     fi
-    if [ -d ~/dotfiles-versions/$version/starship ]; then
-        _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
-    fi
-    if [ -d ~/dotfiles-versions/$version/rofi ]; then
-        _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/dunst ]; then
-        _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/hypr ]; then
-        _installSymLink hypr ~/.config/hypr ~/dotfiles/hypr/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/waybar ]; then
-        _installSymLink waybar ~/.config/waybar ~/dotfiles/waybar/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/swaylock ]; then
-        _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/wlogout ]; then
-        _installSymLink wlogout ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/swappy ]; then
-        _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
-    fi
-
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink .gtkrc-2.0 ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0
-    #fi
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink .Xresources ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources
-    #fi
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/
-    #fi
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink gtk-4.0 ~/.config/gtk-4.0 ~/dotfiles/gtk/gtk-4.0/ ~/.config/            
-    #fi
-else
-    echo "Skipped: DEV MODE!"
 fi
-echo "Symbolic links created."
+if [ -d ~/dotfiles-versions/$version/starship ]; then
-echo ""
+    _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
+fi
+if [ -d ~/dotfiles-versions/$version/rofi ]; then
+    _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/dunst ]; then
+    _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/hypr ]; then
+    _installSymLink hypr ~/.config/hypr ~/dotfiles/hypr/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/waybar ]; then
+    _installSymLink waybar ~/.config/waybar ~/dotfiles/waybar/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/swaylock ]; then
+    _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/wlogout ]; then
+    _installSymLink wlogout ~/.config/wlogout ~/dotfiles/wlogout/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/swappy ]; then
+    _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/eww ]; then
+    _installSymLink eww ~/.config/eww ~/dotfiles/eww/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
+    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
+fi
+if [ -f ~/dotfiles-versions/$version/chrome-flags.conf ]; then
+    _installSymLink chrome-flags ~/.config/chrome-flags.conf ~/dotfiles/chrome-flags.conf ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/Vimix-hyprcursors ]; then
+    if [ ! -d ~/.local/share/icons ]; then mkdir -pv ~/.local/share/icons; fi
+    _installSymLink Vimix-hyprcursors ~/.local/share/icons/Vimix-hyprcursors ~/dotfiles/Vimix-hyprcursors ~/.local/share/icons/
+fi
+if [ -d ~/dotfiles-versions/$version/ranger ]; then
+    _installSymLink ranger ~/.config/ranger ~/dotfiles/ranger/ ~/.config
+fi
+echo ":: Symbolic links created."
+echo

.install/hyprland-packages.sh

@@ -1,16 +0,0 @@
-packagesPacman=(
-    "xdg-desktop-portal-hyprland" 
-    "waybar" 
-    "grim" 
-    "slurp"
-    "swayidle"
-    "swappy"
-    "cliphist"
-);
-
-packagesYay=(
-    "swww" 
-    "swaylock-effects-git" 
-    "wlogout"
-    "nwg-look"
-);

.install/hyprland-version.sh

@@ -1,61 +0,0 @@
-# ------------------------------------------------------
-# Select installation profile
-# ------------------------------------------------------
-echo -e "${GREEN}"
-figlet "Hyprland"
-echo -e "${NONE}"
-
-hyprland_installed=0
-hyprlandgit_installed=0
-hyprland_package=""
-echo "Hyprland is available in two different versions: "
-echo "hyprland with the lastest official release "
-echo "hyprland-git compiled from latest source."
-echo
-echo "Check for installed hyprland package..."
-if [[ $(_isInstalledYay "hyprland-git") == 0 ]]; then
-    echo "hyprland-git already installed!"
-    hyprlandgit_installed=1
-elif [[ $(_isInstalledPacman "hyprland") == 0 ]]; then
-    echo "hyprland already installed!"
-    hyprland_installed=1
-else
-    echo "hyprland NOT installed!"
-fi
-echo
-if [ $hyprland_installed == "1" ] ;then
-    echo "Hyprland is already installed with the package hyprland on your system. How do you want to proceed?"
-    echo "RETURN = confirm. ESC = Keep hyprland"
-    hyprsel=$(gum choose "KEEP hyprland" "Replace with hyprland-git")
-    if [ "$hyprsel" == "Replace with hyprland-git" ] ;then
-        echo "Replace hyprland with hyprland-git."
-        yay  --noconfirm -R hyprland
-        _forcePackagesYay "hyprland-git";
-    else
-        echo "Keep current hyprland installation."
-    fi
-elif [ $hyprlandgit_installed == "1" ] ;then
-    echo "Hyprland is already installed with the package hyprland-git on your system. How do you want to proceed?"
-    echo "RETURN = confirm. ESC = Keep hyprland-git"
-    hyprsel=$(gum choose "KEEP hyprland-git" "Replace with hyprland")
-    if [ "$hyprsel" == "Replace with hyprland" ] ;then
-        echo "Replace hyprland-git with hyprland."
-        yay  --noconfirm -R hyprland-git
-        _forcePackagesYay "hyprland";
-    else
-        echo "Keep current hyprland installation."
-    fi
-else
-    # No hyprland found on the system
-    echo "RETURN = confirm. No selection = CANCEL"
-    hypr_version=$(gum choose "hyprland" "hyprland-git")
-    if [ -z $hypr_version ] ;then
-        echo "No profile selected. Installation canceled."
-        exit
-    fi
-    if [ "$hypr_version" == "hyprland" ] ;then
-        _installPackagesYay "hyprland";
-    else
-        _installPackagesYay "hyprland-git";
-    fi
-fi

.install/hyprland.sh

@@ -1,3 +0,0 @@
-echo -e "${GREEN}"
-figlet "Hyprland"
-echo -e "${NONE}"

.install/includes/excludes.txt

@@ -6,4 +6,5 @@ gtk
 README.md
 CHANGELOG
 LICENSE
-install.sh
+install.sh
+setup.sh

.install/includes/library.sh

@@ -25,7 +25,7 @@ _isInstalledPacman() {
 
 _isInstalledYay() {
     package="$1";
-    check="$(yay -Qs --color always "${package}" | grep "local" | grep "${package} ")";
+    check="$(yay -Qs --color always "${package}" | grep "local" | grep "\." | grep "${package} ")";
     if [ -n "${check}" ] ; then
         echo 0; #'0' means 'true' in Bash
         return; #true
@@ -272,4 +272,26 @@ _replaceLineInFile() {
         echo "ERROR: Target file not found."
         sleep 2
     fi
+}
+
+# ------------------------------------------------------
+# System check
+# ------------------------------------------------------
+
+_commandExists() {
+    package="$1";
+    if ! type $package > /dev/null 2>&1; then
+        echo ":: ERROR: $package doesn't exists. Please install it with yay -S $2"
+    else
+        echo ":: OK: $package command found."
+    fi
+}
+
+_folderExists() {
+    folder="$1";
+    if [ ! -d $folder ]; then
+        echo ":: ERROR: $folder doesn't exists. $2"
+    else
+        echo ":: OK: $folder found."
+    fi
 }

.install/install-packages.sh

@@ -1,10 +1,10 @@
 if [[ "$force_install" == "1" ]] ;then
-echo "Force installation of all packages..."
+    echo "Force installation of all packages..."
-_forcePackagesPacman "${packagesPacman[@]}";
+    _forcePackagesPacman "${packagesPacman[@]}";
-_forcePackagesYay "${packagesYay[@]}";
+    _forcePackagesYay "${packagesYay[@]}";
 else
-echo "Install only missing packages..."
+    echo "Install only missing packages..."
-_installPackagesPacman "${packagesPacman[@]}";
+    _installPackagesPacman "${packagesPacman[@]}";
-_installPackagesYay "${packagesYay[@]}";
+    _installPackagesYay "${packagesYay[@]}";
 fi
-echo ""
+echo

.install/installer.sh

@@ -7,10 +7,11 @@ echo -e "${NONE}"
 if [ -d ~/dotfiles ] ;then
     echo "Do you want to check for new packages only (faster installation)"
     echo "or do you want to reinstall all packages again? (more robust and can help to fix issues)"
+    echo
     if gum confirm "How do you want to proceed?" --affirmative "New packages only" --negative "Force reinstallation" ;then
         force_install=0
     elif [ $? -eq 130 ]; then
-        echo "Installation canceled."
+        echo ":: Installation canceled."
         exit 130
     else
         force_install=1
@@ -18,10 +19,11 @@ if [ -d ~/dotfiles ] ;then
 else
     echo "Do you want to reinstall all already installed packages and install the required new packages? (recommended and more robust)"
     echo "or do you want to install the new required packages only? (could be faster installation)"
+    echo
     if gum confirm "How do you want to proceed?" --affirmative "Reinstall all packages" --negative "Install new packages only" ;then
         force_install=1
     elif [ $? -eq 130 ]; then
-        echo "Installation canceled."
+        echo ":: Installation canceled."
         exit 130
     else
         force_install=0

.install/keyboard.sh

@@ -6,48 +6,85 @@ echo -e "${GREEN}"
 figlet "Keyboard"
 echo -e "${NONE}"
 
-# Default layout and variants
+setkeyboard=0
-keyboard_layout="us"
-
-_setupKeyboardLayout() {
-    echo ""
-    echo "Start typing = Search, RETURN = Confirm, CTRL-C = Cancel"
-    keyboard_layout=$(localectl list-x11-keymap-layouts | gum filter --height 15 --placeholder "Find your keyboard layout...")
-    echo ""
-    echo ":: Keyboard layout changed to $keyboard_layout"
-    echo ""
-    _confirmKeyboard
-}
-
-_confirmKeyboard() {
-    echo "Current selected keyboard setup:"
-    echo "Keyboard layout: $keyboard_layout"
-    if gum confirm "Do you want proceed with this keyboard setup?" --affirmative "Proceed" --negative "Change" ;then
-        return 0
-    elif [ $? -eq 130 ]; then
-        exit 130
-    else
-        _setupKeyboardLayout
-    fi
-}
-
 if [ "$restored" == "1" ]; then
     echo ":: You have already restored your settings into the new installation."
-else
+    echo "You can repeat the keyboard setup again to choose between a desktop and laptop optimized configuration."
+    echo
+    if gum confirm "Do you want to setup your keyboard again?" ;then
+        setkeyboard=0
+    elif [ $? -eq 130 ]; then
+        echo ":: Installation canceled."
+        exit 130
+    else
+        echo ":: Keyboard setup skipped."
+        setkeyboard=1
+    fi
+fi
+
+if [ "$setkeyboard" == "0" ] ;then
+
+    # Default layout and variants
+    keyboard_layout="us"
+    keyboard_variant=""
+
+    _setupKeyboardLayout() {
+        keyboard_layout=$(localectl list-x11-keymap-layouts | gum filter --height 15 --placeholder "Find your keyboard layout...")
+        echo ":: Keyboard layout changed to $keyboard_layout"
+        _setupKeyboardVariant
+    }
+
+    _setupKeyboardVariant() {
+        if gum confirm "Do you want to set a variant of the keyboard?" ; then
+            keyboard_variant=$(localectl list-x11-keymap-variants | gum filter --height 15 --placeholder "Find your keyboard layout...")
+            echo ":: Keyboard variant changed to $keyboard_variant"
+        fi
+        _confirmKeyboard
+    }
+
+    _confirmKeyboard() {
+        echo
+        echo "Current selected keyboard setup:"
+        echo "Keyboard layout: $keyboard_layout"
+        echo "Keyboard variant: $keyboard_variant"
+        echo
+        if gum confirm "Do you want proceed with this keyboard setup?" --affirmative "Proceed" --negative "Change" ;then
+            return 0
+        elif [ $? -eq 130 ]; then
+            exit 130
+        else
+            _setupKeyboardLayout
+        fi
+    }
+
     _confirmKeyboard
-    
+
-    cp .install/templates/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
+    if gum confirm "Are you using a laptop and would you like to enable the laptop presets?"; then
+        cp .install/templates/keyboard-laptop.conf ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
+        echo "source = ~/dotfiles/hypr/conf/layouts/laptop.conf" >  ~/dotfiles-versions/$version/hypr/conf/layout.conf
+    elif [ $? -eq 130 ]; then
+        echo ":: Installation canceled."
+        exit 130
+    else
+        cp .install/templates/keyboard-default.conf ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
+    fi
     cp .install/templates/autostart.sh ~/dotfiles-versions/$version/qtile/autostart.sh
 
     SEARCH="KEYBOARD_LAYOUT"
     REPLACE="$keyboard_layout"
     sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
 
+    SEARCH="KEYBOARD_VARIANT"
+    REPLACE="$keyboard_variant"
+    sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/hypr/conf/keyboard.conf
+
     SEARCH="KEYBOARD_LAYOUT"
     REPLACE="$keyboard_layout"
     sed -i "s/$SEARCH/$REPLACE/g" ~/dotfiles-versions/$version/qtile/autostart.sh
 
-    echo ""
+    echo
-    echo ":: Keyboard setup updated successfully."
+    echo ":: Keyboard setup complete."
+    echo
     echo "PLEASE NOTE: You can update your keyboard layout later in ~/dotfiles/hypr/conf/keyboard.conf"
-fi
+
+fi 

.install/monitor.sh

@@ -1,27 +0,0 @@
-# ------------------------------------------------------
-# Monitor
-# ------------------------------------------------------
-
-if [[ $profile == *"Hyprland"* ]]; then
-echo -e "${GREEN}"
-figlet "Monitor"
-echo -e "${NONE}"
-    if [ "$monitorrestored" == "1" ]; then
-        echo "Monitor settings could already be restored".
-        echo ""
-    else
-        echo "Hyprland will use the following monitor setup from ~/dotfiles/hypr/conf/monitors/default.conf"
-        echo "monitor=,preferred,auto,1"
-        echo ""
-        echo "You can create your own monitor configuration by adding a new variation file ~/dotfiles/hypr/conf/monitors/mymonitor.conf"
-        echo "Add there your monitor configuration."
-        echo ""
-        echo "After starting Hyprland, you can select your custom monitor variation with SUPER+CMD+S (or by clicking on the settings icon in WayBar)."
-        echo "Select Monitors and then your custom monitor variation: ~/dotfiles/hypr/conf/monitors/mymonitor.conf"
-        echo ""
-        echo "Or overwrite the path on ~/dotfiles/hypr/conf/monitor.conf and replace it with your custom variation."
-        echo ""
-        echo "More information on how to setup your monitor in the Hyprland Wiki: https://wiki.hyprland.org/Configuring/Monitors/"
-        echo ""
-    fi
-fi

.install/neovim.sh

@@ -0,0 +1,21 @@
+# ------------------------------------------------------
+# Neovim
+# ------------------------------------------------------
+neovim=0
+if [ -d ~/dotfiles/nvim ]; then
+echo -e "${GREEN}"
+figlet "Neovim"
+echo -e "${NONE}"
+    echo ":: The script has detected a nvim folder."
+    echo
+    if gum confirm "Do you want to install the ML4W Neovim configuration?"; then
+        echo ":: ML4W Neovim configuration will be installed"
+        neovim=1
+    elif [ $? -eq 130 ]; then
+        echo ":: Installation canceled."
+        exit 130
+    else
+        rm -rf ~/dotfiles-versions/$version/nvim/
+        echo ":: Installation of ML4W Neovim configuration skipped."
+    fi
+fi

.install/packages/general-packages.sh

@@ -0,0 +1,59 @@
+packagesPacman=(
+    "pacman-contrib"
+    "vim"
+    "bat"
+    "fzf"
+    "zsh"
+    "fastfetch"
+    "ranger"
+    "btop"
+    "neovim"
+    "wget"
+    "unzip"
+    "alacritty"
+    "dunst"
+    "starship"
+    "mpv"
+    "thunar"
+    "nautilus"
+    "noto-fonts"
+    "otf-font-awesome"
+    "ttf-fira-sans"
+    "ttf-fira-code"
+    "ttf-firacode-nerd"
+    "ttf-firacode-nerd"
+    "figlet"
+    "vlc"
+    "eza"
+    "python-pip"
+    "python-psutil"
+    "python-rich"
+    "python-pywal"
+    "pavucontrol"
+    "tumbler"
+    "papirus-icon-theme"
+    "gum"
+    "man-pages"
+    "gvfs"
+    "xdg-user-dirs"
+#    "xdg-desktop-portal-gtk"
+    "xarchiver"
+    "thunar-archive-plugin"
+    "zip"
+    "fuse2"
+    "xdg-desktop-portal"
+    "qalculate-gtk"
+    "imagemagick"
+    "jq"
+    "rofi-wayland"
+    "fastfetch"
+    "pipewire-pulse"
+    "wireplumber"
+);
+
+packagesYay=(
+    "vimix-cursors"
+    "orchis-theme"
+    "trizen"
+    "google-chrome"
+);

.install/packages/hyprland-packages.sh

@@ -0,0 +1,22 @@
+packagesPacman=(
+    "hyprland"
+    "hyprpaper"
+    "hyprlock"
+    "hypridle"
+    #    "xdg-desktop-portal-hyprland"
+    "hyprpolkitagent"
+    "waybar"
+    "grim"
+    "slurp"
+    "swappy"
+    "cliphist"
+    "kitty"
+)
+
+packagesYay=(
+    "pyprland"
+    "wlogout"
+    "nwg-look"
+    "eww"
+    "hyprshade"
+)

.install/paralleldownloads.sh

@@ -0,0 +1,55 @@
+#!/bin/bash
+# ------------------------------------------------------
+# Activate parallel downloads
+# ------------------------------------------------------
+
+# Search for the line containing "ParallelDownloads = 5"
+line=$(grep "ParallelDownloads = 5" /etc/pacman.conf)
+
+# Check if the line starts with a '#' character
+if [[ $line == \#* ]]; then
+    echo -e "${GREEN}"
+    figlet "Downloads"
+    echo -e "${NONE}"
+    echo ":: You can activate parallel downloads in pacman.conf to speedup the download of packages?"
+    if gum confirm "Do you want to activate parallel downloads?"; then
+
+        # Remove the '#' character from the beginning of the line
+        echo ":: Modifying pacman.conf to enable parallel downloads."
+        new_line=$(echo $line | sed 's/^#//')
+
+        # Replace the original line with the new line in the configuration file
+        sudo sed -i "s/$line/$new_line/g" /etc/pacman.conf
+
+        # Display a message indicating that the line was modified
+        echo ":: Modified line: $new_line"
+    elif [ $? -eq 130 ]; then
+            exit
+    else
+        echo ":: Activation of parallel downloads skipped."
+    fi
+else
+    # Check if the line is already uncommented
+    if [[ $line == ParallelDownloads\ =\ 5 ]]; then
+        # Display a message indicating that the line does not need to be modified
+        echo ":: pacman.conf already optimized for parallel downloads."
+    else
+        # Display a message indicating that the line is missing or commented out
+        echo ":: Parallel downloads could not be activated. Required configuration in /etc/pacman.conf could not found."
+    fi
+fi
+
+# Activate Color in pacman.conf
+if grep -Fxq "#Color" /etc/pacman.conf
+then
+    sudo sed -i 's/^#Color/Color/' /etc/pacman.conf
+    echo ":: Color activated in pacman.conf"
+else
+    echo ":: Color is already activated in pacman.conf"
+fi
+if grep -Fxq "# Color" /etc/pacman.conf
+then
+    sudo sed -i 's/^# Color/Color/' /etc/pacman.conf
+    echo ":: Color activated in pacman.conf"
+fi
+echo

.install/preparation.sh

@@ -4,7 +4,14 @@
 echo -e "${GREEN}"
 figlet "Preparation"
 echo -e "${NONE}"
-echo ":: Preparing temporary folders for the installation."
+if [ -d ~/.config ]; then
+    echo ":: $HOME/.config folder already exists."
+else
+    mkdir ~/.config
+    echo ":: $HOME/.config folder created."
+fi
+echo
+echo "Preparing temporary folders for the installation."
 if [ ! -d ~/dotfiles-versions ]; then
     mkdir ~/dotfiles-versions
     echo ":: ~/dotfiles-versions folder created."
@@ -18,12 +25,12 @@ else
     mkdir ~/dotfiles-versions/$version
     echo ":: Clean build prepared for the installation."
 fi
-rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/
+rsync -a -I --exclude-from=.install/includes/excludes.txt . ~/dotfiles-versions/$version/
 if [[ $(_isFolderEmpty ~/dotfiles-versions/$version/) == 0 ]] ;then
     echo "AN ERROR HAS OCCURED. Preparation of ~/dotfiles-versions/$version/ failed" 
     echo "Please check that rsync is installad on your system."
-    echo "Execution of rsync -a -I --exclude-from=.install/excludes.txt . ~/dotfiles-versions/$version/ is required."
+    echo "Execution of rsync -a -I --exclude-from=.install/includes/excludes.txt . ~/dotfiles-versions/$version/ is required."
     exit
 fi
-echo ":: dotfiles $version successfully prepared in ~/dotfiles-versions/$version/"
+echo ":: ML4W Dotfiles $version successfully prepared in ~/dotfiles-versions/$version/"
-echo ""
+echo

.install/profile.sh

@@ -4,13 +4,13 @@
 echo -e "${GREEN}"
 figlet "Profile"
 echo -e "${NONE}"
-
+echo "Please select your installation profile."
-echo "SPACE = select/unselect a profile. RETURN = confirm. No selection = CANCEL"
+echo
 profile=$(gum choose --no-limit --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "Hyprland" "Qtile")
 
 if [ -z "${profile}" ] ;then
-    echo "No profile selected. Installation canceled."
+    echo ":: No profile selected. Installation canceled."
     exit
 else
-    echo "Profile/s selected:" $profile
+    echo ":: Profile/s selected:" $profile
 fi

.install/pywal.sh

@@ -1,14 +0,0 @@
-# ------------------------------------------------------
-# Install pywal
-# ------------------------------------------------------
-echo -e "${GREEN}"
-figlet "Pywal"
-echo -e "${NONE}"
-if [ -f /usr/bin/wal ]; then
-    echo "pywal already installed. Trying to force the installation with python-pywal"
-    yay -S --noconfirm python-pywal --ask 4
-else
-   yay -S --noconfirm python-pywal
-    echo "Pywal installed."
-fi
-echo ""

.install/qtile-dotfiles.sh

@@ -2,54 +2,40 @@
 # Install dotfiles
 # ------------------------------------------------------
 
-if [ ! $mode == "dev" ]; then
+if [ -d ~/dotfiles-versions/$version/alacritty ]; then
-    if [ -d ~/dotfiles-versions/$version/alacritty ]; then
+    _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
-        _installSymLink alacritty ~/.config/alacritty ~/dotfiles/alacritty/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/vim ]; then
-        _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/nvim ]; then
-        _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/starship ]; then
-        _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
-    fi
-    if [ -d ~/dotfiles-versions/$version/rofi ]; then
-        _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/dunst ]; then
-        _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/qtile ]; then
-        _installSymLink qtile ~/.config/qtile ~/dotfiles/qtile/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/polybar ]; then
-        _installSymLink polybar ~/.config/polybar ~/dotfiles/polybar/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/picom ]; then
-        _installSymLink picom ~/.config/picom ~/dotfiles/picom/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/qtile ]; then
-        _installSymLink .xinitrc ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc
-    fi
-    if [ -d ~/dotfiles-versions/$version/swaylock ]; then
-        _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
-    fi
-    if [ -d ~/dotfiles-versions/$version/swappy ]; then
-        _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
-    fi
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink .gtkrc-2.0 ~/.gtkrc-2.0 ~/dotfiles/gtk/.gtkrc-2.0 ~/.gtkrc-2.0
-    #fi
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink .Xresources ~/.Xresources ~/dotfiles/gtk/.Xresources ~/.Xresources
-    #fi
-    #if [ -d ~/dotfiles-versions/$version/gtk ]; then
-    #    _installSymLink gtk-3.0 ~/.config/gtk-3.0 ~/dotfiles/gtk/gtk-3.0/ ~/.config/       
-    #fi
-else
-    echo "Skipped: DEV MODE!"
 fi
-echo "Symbolic links created."
+if [ -d ~/dotfiles-versions/$version/vim ]; then
-echo ""
+    _installSymLink vim ~/.config/vim ~/dotfiles/vim/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/nvim ]; then
+    _installSymLink nvim ~/.config/nvim ~/dotfiles/nvim/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/starship ]; then
+    _installSymLink starship ~/.config/starship.toml ~/dotfiles/starship/starship.toml ~/.config/starship.toml
+fi
+if [ -d ~/dotfiles-versions/$version/rofi ]; then
+    _installSymLink rofi ~/.config/rofi ~/dotfiles/rofi/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/dunst ]; then
+    _installSymLink dunst ~/.config/dunst ~/dotfiles/dunst/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/qtile ]; then
+    _installSymLink qtile ~/.config/qtile ~/dotfiles/qtile/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/picom ]; then
+    _installSymLink picom ~/.config/picom ~/dotfiles/picom/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/qtile ]; then
+    _installSymLink .xinitrc ~/.xinitrc ~/dotfiles/qtile/.xinitrc ~/.xinitrc
+fi
+if [ -d ~/dotfiles-versions/$version/swaylock ]; then
+    _installSymLink swaylock ~/.config/swaylock ~/dotfiles/swaylock/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/swappy ]; then
+    _installSymLink swappy ~/.config/swappy ~/dotfiles/swappy/ ~/.config
+fi
+if [ -d ~/dotfiles-versions/$version/fastfetch ]; then
+    _installSymLink fastfetch ~/.config/fastfetch ~/dotfiles/fastfetch/ ~/.config
+fi
+echo ":: Symbolic links created."

.install/qtile.sh

@@ -1,3 +0,0 @@
-echo -e "${GREEN}"
-figlet "Qtile"
-echo -e "${NONE}"

.install/reboot.sh

@@ -0,0 +1,18 @@
+# ------------------------------------------------------
+# Reboot
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "Reboot"
+echo -e "${NONE}"
+echo "A reboot of your system is recommended."
+echo
+if gum confirm "Do you want to reboot your system now?" ;then
+    gum spin --spinner dot --title "Rebooting now..." -- sleep 3
+    systemctl reboot
+elif [ $? -eq 130 ]; then
+    exit 130
+else
+    echo ":: Reboot skipped"
+fi
+echo ""

.install/remove.sh

@@ -0,0 +1,60 @@
+#!/bin/bash
+
+# Remove Rofi Calc
+if [[ $(_isInstalledPacman "rofi-calc") == 0 ]]; then
+    sudo pacman --noconfirm -Rns rofi-calc
+    echo ":: rofi-calc removed"
+    echo
+fi
+
+# Remove Rofi
+if [[ $(_isInstalledPacman "rofi") == 0 ]]; then
+    sudo pacman --noconfirm -Rns rofi
+    echo ":: rofi removed"
+    echo
+fi
+
+# Remove Swayidle
+if [[ $(_isInstalledPacman "swayidle") == 0 ]]; then
+    sudo pacman --noconfirm -Rns swayidle
+    echo ":: swayidle removed"
+    echo
+fi
+
+# Remove Swaylock
+if [[ $(_isInstalledYay "swaylock-effects-git") == 0 ]]; then
+    yay --noconfirm -Rns swaylock-effects-git
+    echo ":: swaylock removed"
+    echo
+fi
+
+# Remove rofi-lbonn-wayland
+if [[ $(_isInstalledYay "rofi-lbonn-wayland") == 0 ]]; then
+    yay --noconfirm -Rns rofi-lbonn-wayland
+    echo ":: rofi-lbonn-wayland removed"
+    echo
+fi
+
+# Remove hypridle-bin
+if [[ $(_isInstalledYay "hypridle-git") == 0 ]]; then
+    yay --noconfirm -Rns hypridle-git
+    if [ -f /usr/lib/debug/usr/bin/hypridle.debug ] ;then
+        sudo rm /usr/lib/debug/usr/bin/hypridle.debug
+        echo ":: /usr/lib/debug/usr/bin/hypridle.debug removed"
+    fi
+    echo ":: hypridle-git uninstalled."
+    echo ":: hypridle can now be installed."
+    echo 
+fi
+
+# Remove hyprlock-bin
+if [[ $(_isInstalledYay "hyprlock-git") == 0 ]]; then
+    yay --noconfirm -Rns hyprlock-git
+    if [ -f /usr/lib/debug/usr/bin/hyprlock.debug ] ;then
+        sudo rm /usr/lib/debug/usr/bin/hyprlock.debug
+        echo ":: /usr/lib/debug/usr/bin/hyprlock.debug removed"
+    fi
+    echo ":: hyprlock-git uninstalled."
+    echo ":: hyprlock can now be installed."
+    echo
+fi

.install/required.sh

@@ -4,12 +4,11 @@
 
 # Synchronize packages
 sudo pacman -Sy
-echo ""
+echo
 
 # Check for required packages
-echo ":: Checking that required packages for the installation are installed..."
+echo "Checking that required packages for the installation are installed..."
-_installPackagesPacman "rsync" "gum" "figlet";
+_installPackagesPacman "rsync" "gum" "figlet" "python";
-echo ""
 
 # Double check rsync
 if ! command -v rsync &> /dev/null; then
@@ -18,4 +17,4 @@ if ! command -v rsync &> /dev/null; then
 else
     echo ":: rsync double checked"
 fi
-echo ""
+echo

.install/restore.py

@@ -0,0 +1,149 @@
+#  __  __ _    _  ___        __                _                 
+# |  \/  | |  | || \ \      / /  _ __ ___  ___| |_ ___  _ __ ___ 
+# | |\/| | |  | || |\ \ /\ / /  | '__/ _ \/ __| __/ _ \| '__/ _ \
+# | |  | | |__|__   _\ V  V /   | | |  __/\__ \ || (_) | | |  __/
+# |_|  |_|_____| |_|  \_/\_/    |_|  \___||___/\__\___/|_|  \___|
+#                                                                
+
+import sys
+import subprocess
+import os
+import json
+import pathlib
+import shutil
+
+# Get script path
+pathname = os.path.dirname(sys.argv[0])
+
+class ML4WRestore:
+
+    waybar_themes = [
+        "ml4w-minimal",
+        "ml4w",
+        "ml4w-blur",
+        "ml4w-blur-bottom",
+        "ml4w-bottom"
+    ]
+
+    defaults = {
+        "waybar_timeformat": "%H:%M",
+        "waybar_dateformat": "%a",
+        "waybar_custom_timedateformat": "",
+        "waybar_workspaces": 5,
+        "rofi_bordersize": 3,
+        "waybar_network": True,
+        "waybar_chatgpt": True,
+        "waybar_systray": True,
+        "waybar_screenlock": True,
+        "waybar_window": True
+    }    
+
+    path_name = pathname # Path of Application
+    homeFolder = os.path.expanduser('~') # Path to home folder
+    dotfiles = homeFolder + "/dotfiles/"
+    settings = {}
+
+    def __init__(self):
+        # Load settings.json
+        settings_file = open(self.dotfiles + ".settings/settings.json")
+        settings_arr = json.load(settings_file)
+        for row in settings_arr:
+            self.settings[row["key"]] = row["value"]
+
+        self.loadSwitchAll("waybar_network","network")
+        self.loadSwitchAll("waybar_systray","tray")
+        self.loadSwitchAll("waybar_window","hyprland/window")
+        self.loadSwitchAll("waybar_screenlock","idle_inhibitor")
+        self.loadSwitch("waybar_chatgpt","custom/chatgpt")
+
+        # Waybar Workspaces
+        if "waybar_workspaces" in self.settings:
+            value = int(self.settings["waybar_workspaces"])
+            text = '            "*": ' + str(value)
+            self.replaceInFileNext("waybar/modules.json", "// START WORKSPACES", text)
+            print (":: waybar_workspaces restored")
+
+        # Rofi BorderSize
+        if "rofi_bordersize" in self.settings:
+            value = int(self.settings["rofi_bordersize"])
+            text = "* { border-width: " + str(value) + "px; }"
+            self.overwriteFile(".settings/rofi-border.rasi",text)
+            print (":: rofi_bordersize restored")
+        
+        # Time/DateFormat
+        if "waybar_timeformat" in self.settings:
+            timeformat = self.settings["waybar_timeformat"]
+        else:
+            timeformat = self.defaults["waybar_timeformat"]
+
+        if "waybar_dateformat" in self.settings:
+            dateformat = self.settings["waybar_dateformat"]
+        else:
+            dateformat = self.defaults["waybar_dateformat"]
+
+        if "waybar_custom_timedateformat" in self.settings:
+            custom_format = self.settings["waybar_custom_timedateformat"]
+        else:
+            custom_format = self.defaults["waybar_custom_timedateformat"]
+
+        if custom_format != "":
+            timedate = '        "format": "{:' + custom_format + '}",'
+            self.replaceInFileNext("waybar/modules.json", "TIMEDATEFORMAT", timedate)
+        else:
+            timedate = '        "format": "{:' + timeformat + ' - ' + dateformat + '}",'
+            self.replaceInFileNext("waybar/modules.json", "TIMEDATEFORMAT", timedate)
+        print (":: timedate format restored")
+
+    def loadSwitch(self,k,m):
+        if k in self.settings:
+            if not self.settings[k]:
+                self.replaceInFile("waybar/modules.json",'"' + m + '"','            //"' + m + '",')
+                print (":: " + k + " restored")
+
+    def loadSwitchAll(self,k,m):
+        if k in self.settings:
+            if not self.settings[k]:
+                for t in self.waybar_themes:
+                    self.replaceInFile("waybar/themes/" + t + "/config",'"' + m + '"','        //"' + m + '",')
+                print (":: " + k + " restored")
+
+    # Overwrite Text in File
+    def overwriteFile(self, f, text):
+        file=open(self.dotfiles + f,"w+")
+        file.write(text)
+        file.close()
+
+    # Replace Text in File
+    def replaceInFile(self, f, search, replace):
+        file = open(self.dotfiles + f, 'r')
+        lines = file.readlines()
+        count = 0
+        found = 0
+        # Strips the newline character
+        for l in lines:
+            count += 1
+            if search in l:
+                found = count
+        if found > 0:
+            lines[found - 1] = replace + "\n"
+            with open(self.dotfiles + f, 'w') as file:
+                file.writelines(lines)
+
+    # Replace Text in File
+    def replaceInFileNext(self, f, search, replace):
+        file = open(self.dotfiles + f, 'r')
+        lines = file.readlines()
+        count = 0
+        found = 0
+        # Strips the newline character
+        for l in lines:
+            count += 1
+            if search in l:
+                found = count
+        if found > 0:
+            lines[found] = replace + "\n"
+            with open(self.dotfiles + f, 'w') as file:
+                file.writelines(lines)
+
+
+ml4wrestore = ML4WRestore()

.install/restore.sh

@@ -8,18 +8,32 @@ monitorrestored=0
 
 _showRestoreOptions() {
     echo "The following configurations can be transferred into the new installation."
-    echo "(SPACE = select/unselect a profile. RETURN = confirm. No selection = CANCEL)"
+    echo
-    echo ""
     restorelist=""
     if [ -f ~/dotfiles/.bashrc ]; then
         restorelist+="~/dotfiles/.bashrc "
         selectedlist+="~/dotfiles/.bashrc,"
     fi
+    if [ -f ~/dotfiles/.zshrc ]; then
+        restorelist+="~/dotfiles/.zshrc "
+        selectedlist+="~/dotfiles/.zshrc,"
+    fi
+    if [ -f ~/dotfiles/.p10k.zsh ]; then
+        restorelist+="~/dotfiles/.p10k.zsh "
+        selectedlist+="~/dotfiles/.p10k.zsh,"
+    fi
     if [ -d ~/dotfiles/.settings ]; then
         restorelist+="~/dotfiles/.settings "
         selectedlist+="~/dotfiles/.settings,"
     fi
     if [[ $profile == *"Hyprland"* ]]; then
+        if [ -f ~/dotfiles/hypr/hypridle.conf ]; then
+            if grep -Fxq "# Version 2.8.3" ~/dotfiles/hypr/hypridle.conf
+            then
+                restorelist+="~/dotfiles/hypr/hypridle.conf "
+                selectedlist+="~/dotfiles/hypr/hypridle.conf,"
+            fi
+        fi
         if [ -f ~/dotfiles/hypr/conf/custom.conf ]; then
             restorelist+="~/dotfiles/hypr/conf/custom.conf "
             selectedlist+="~/dotfiles/hypr/conf/custom.conf,"
@@ -36,6 +50,10 @@ _showRestoreOptions() {
             restorelist+="~/dotfiles/hypr/conf/environment.conf "
             selectedlist+="~/dotfiles/hypr/conf/environment.conf,"
         fi
+        if [ -f ~/dotfiles/hypr/conf/layout.conf ] && [ -d ~/dotfiles/hypr/conf/layouts/ ]; then
+            restorelist+="~/dotfiles/hypr/conf/layout.conf "
+            selectedlist+="~/dotfiles/hypr/conf/layout.conf,"
+        fi
         if [ -f ~/dotfiles/hypr/conf/windowrule.conf ] && [ -d ~/dotfiles/hypr/conf/windowrules/ ]; then
             restorelist+="~/dotfiles/hypr/conf/windowrule.conf "
             selectedlist+="~/dotfiles/hypr/conf/windowrule.conf,"
@@ -43,7 +61,6 @@ _showRestoreOptions() {
         if [ -f ~/dotfiles/hypr/conf/monitor.conf ] && [ -d ~/dotfiles/hypr/conf/monitors/ ]; then
             restorelist+="~/dotfiles/hypr/conf/monitor.conf "
             selectedlist+="~/dotfiles/hypr/conf/monitor.conf,"
-            monitorrestored=1
         fi
         if [ -f ~/dotfiles/hypr/conf/animation.conf ] && [ -d ~/dotfiles/hypr/conf/animations/ ]; then
             restorelist+="~/dotfiles/hypr/conf/animation.conf "
@@ -66,26 +83,30 @@ _showRestoreOptions() {
     fi
     restoreselect=$(gum choose --no-limit --height 20 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " --selected="$selectedlist" $restorelist)
     if [ ! -z "$restoreselect" ] ;then
-        echo "Selected to restore:" 
+        echo "Selected to restore:"
         echo "$restoreselect"
         echo ""
-        confirmrestore=$(gum choose "Start restore" "Change restore" "Cancel restore")
+        confirmrestore=$(gum choose "Start restore" "Change restore" "Skip restore")
         if [ "$confirmrestore" == "Start restore" ] ;then
             _startRestore
-        elif [ "$confirmrestore" == "Change restore" ]; then 
+        elif [ "$confirmrestore" == "Change restore" ]; then
             _showRestoreOptions
         else
-            echo "Restore skipped."
+            echo ":: Restore skipped."
             return 0
         fi
     else
         echo "No files selected to restore."
-        confirmrestore=$(gum choose "Change restore" "Cancel restore")
+        confirmrestore=$(gum choose "Change restore" "Skip restore")
-        if [ "$confirmrestore" == "Change restore" ]; then 
+        if [ -z "${confirmrestore}" ] ;then
+            echo ":: Installation canceled."
+            exit
+        fi
+        if [ "$confirmrestore" == "Change restore" ]; then
             echo ""
             _showRestoreOptions
         else
-            echo "Restore skipped."
+            echo ":: Restore skipped."
             return 0
         fi
     fi
@@ -95,68 +116,80 @@ _startRestore() {
     if [[ $restoreselect == *"~/dotfiles/.bashrc"* ]] || [[ $restoreselect == *"All"* ]] ; then
         if [ -f ~/dotfiles/.bashrc ]; then
             cp ~/dotfiles/.bashrc ~/dotfiles-versions/$version/
-            echo ".bashrc restored!"
+            echo ":: .bashrc restored!"
         fi
     fi
     if [[ $restoreselect == *"~/dotfiles/.settings"* ]] || [[ $restoreselect == *"All"* ]] ; then
         if [ -d ~/dotfiles/.settings ]; then
-            rsync -a -I ~/dotfiles/.settings/ ~/dotfiles-versions/$version/.settings/
+            rsync -avhp -I ~/dotfiles/.settings/ ~/dotfiles-versions/$version/.settings/
-            echo ".settings restored!"
+            echo ":: .settings restored!"
         fi
     fi
     if [[ $profile == *"Hyprland"* ]]; then
+        if [[ $restoreselect == *"~/dotfiles/hypr/hypridle.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
+            if [ -f ~/dotfiles/hypr/hypridle.conf ]; then
+                cp ~/dotfiles/hypr/hypridle.conf ~/dotfiles-versions/$version/hypr/
+                echo ":: Hyprland hypridle.conf restored!"
+            fi
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/custom.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/custom.conf ]; then
                 cp ~/dotfiles/hypr/conf/custom.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland custom.conf restored!"
+                echo ":: Hyprland custom.conf restored!"
             fi
         fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/keyboard.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/keyboard.conf ]; then
                 cp ~/dotfiles/hypr/conf/keyboard.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland keyboard.conf restored!"
+                echo ":: Hyprland keyboard.conf restored!"
             fi
-        fi        
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/monitor.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/monitor.conf ]; then
                 cp ~/dotfiles/hypr/conf/monitor.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland monitor.conf restored!"                
+                echo ":: Hyprland monitor.conf restored!"
             fi
         fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/keybinding.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/keybinding.conf ]; then
                 cp ~/dotfiles/hypr/conf/keybinding.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland keybinding.conf restored!"
+                echo ":: Hyprland keybinding.conf restored!"
             fi
         fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/environment.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/environment.conf ]; then
                 cp ~/dotfiles/hypr/conf/environment.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland environment.conf restored!"
+                echo ":: Hyprland environment.conf restored!"
             fi
-        fi        
+        fi
+        if [[ $restoreselect == *"~/dotfiles/hypr/conf/layout.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
+            if [ -f ~/dotfiles/hypr/conf/layout.conf ]; then
+                cp ~/dotfiles/hypr/conf/layout.conf ~/dotfiles-versions/$version/hypr/conf/
+                echo ":: Hyprland layout.conf restored!"
+            fi
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/windowrule.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/windowrule.conf ]; then
                 cp ~/dotfiles/hypr/conf/windowrule.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland windowrule.conf restored!"
+                echo ":: Hyprland windowrule.conf restored!"
             fi
-        fi        
+        fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/animation.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/animation.conf ]; then
                 cp ~/dotfiles/hypr/conf/animation.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland animation.conf restored!"
+                echo ":: Hyprland animation.conf restored!"
             fi
         fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/decoration.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/decoration.conf ]; then
                 cp ~/dotfiles/hypr/conf/decoration.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland decoration.conf restored!"
+                echo ":: Hyprland decoration.conf restored!"
             fi
         fi
         if [[ $restoreselect == *"~/dotfiles/hypr/conf/window.conf"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/hypr/conf/window.conf ]; then
                 cp ~/dotfiles/hypr/conf/window.conf ~/dotfiles-versions/$version/hypr/conf/
-                echo "Hyprland window.conf restored!"
+                echo ":: Hyprland window.conf restored!"
             fi
         fi
     fi
@@ -164,7 +197,7 @@ _startRestore() {
         if [[ $restoreselect == *"~/dotfiles/qtile/autostart.sh"* ]] || [[ $restoreselect == *"All"* ]] ; then
             if [ -f ~/dotfiles/qtile/autostart.sh ]; then
                 cp ~/dotfiles/qtile/autostart.sh ~/dotfiles-versions/$version/qtile/
-                echo "Qtile autostart.sh restored!"
+                echo ":: Qtile autostart.sh restored!"
             fi
         fi
     fi
@@ -173,158 +206,14 @@ _startRestore() {
 }
 
 if [ -d ~/dotfiles ]; then
-
+    echo -e "${GREEN}"
-echo -e "${GREEN}"
+    figlet "Restore"
-figlet "Restore"
+    echo -e "${NONE}"
-echo -e "${NONE}"
+        restored=0
-    restored=0
+        echo "The script will try to restore existing configurations."
-    echo "The script will try to restore existing configurations."
+        echo "PLEASE NOTE: Restoring is not possible with version < 2.6 of the dotfiles."
-    echo "PLEASE NOTE: Restoring is not possible with version < 2.6 of the dotfiles."
+        echo "In that case, please use the automated backup or create your own backup manually."
-    echo "In that case, please use the automated backup or create your own backup manually."
+        echo ""
-    echo ""
+        _showRestoreOptions
-    
+        echo ""
-    _showRestoreOptions
-
-    # Restore Waybar Workspaces
-    targetFile="$HOME/dotfiles-versions/$version/waybar/modules.json"
-    settingsFile="$HOME/dotfiles/.settings/waybar_workspaces"
-    if [ -f $settingsFile ] ;then
-        startMarker="START WORKSPACE"
-        endMarker="END WORKSPACES"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile"
-        echo "Waybar Workspaces restored."
-    fi
-
-    # Restore Waybar Appslabel
-    targetFile="$HOME/dotfiles-versions/$version/waybar/modules.json"
-    settingsFile="$HOME/dotfiles/.settings/waybar_appslabel"
-    if [ -f $settingsFile ] ;then
-        startMarker="START APPS LABEL"
-        endMarker="END APPS LABEL"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile"
-        echo "Waybar Appslabel restored."
-    fi
-
-    # Restore Waybar ChatGPT
-    targetFile="$HOME/dotfiles/waybar/modules.json"
-    settingsFile="$HOME/dotfiles/.settings/waybar_chatgpt"
-    if [ -f $settingsFile ] ;then
-        startMarker="START CHATGPT TOOGLE"
-        endMarker="END CHATGPT TOOGLE"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile"
-        echo "Waybar ChatGPT restored."
-    fi
-
-    # Restore Waybar Bluetooth
-    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"
-    targetFile5="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-minimal/config"
-    settingsFile="$HOME/dotfiles/.settings/waybar_bluetooth"
-    if [ -f $settingsFile ] ;then
-        startMarker="START BT TOOGLE"
-        endMarker="END BT TOOGLE"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile1"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile2"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile3"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile4"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile5"
-        echo "Waybar Bluetooth restored."
-    fi
-
-    # Restore Waybar Systray
-    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"
-    targetFile5="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-minimal/config"
-    settingsFile="$HOME/dotfiles/.settings/waybar_systray"
-    if [ -f $settingsFile ] ;then
-        startMarker="START TRAY TOOGLE"
-        endMarker="END TRAY TOOGLE"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile1"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile2"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile3"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile4"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile5"
-        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"
-    targetFile5="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-minimal/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"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile5"
-        echo "Waybar Network restored."
-    fi
-
-    # Restore Waybar Idle
-    targetFile1="$HOME/dotfiles/waybar/themes/ml4w/config"
-    targetFile2="$HOME/dotfiles/waybar/themes/ml4w-blur/config"
-    targetFile3="$HOME/dotfiles/waybar/themes/ml4w-blur-bottom/config"
-    targetFile4="$HOME/dotfiles/waybar/themes/ml4w-bottom/config"
-    targetFile5="$HOME/dotfiles-versions/$version/waybar/themes/ml4w-minimal/config"
-    settingsFile="$HOME/dotfiles/.settings/waybar_swaylock"
-    if [ -f $settingsFile ] ;then
-        startMarker="START IDLE TOOGLE"
-        endMarker="END IDLE TOOGLE"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile1"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile2"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile3"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile4"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile5"
-        echo "Waybar Idle 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
-
-    # Restore Keyboard natural_scroll
-    targetFile="$HOME/dotfiles-versions/$version/hypr/conf/keyboard.conf"
-    settingsFile="$HOME/dotfiles/.settings/keyboard_naturalscroll"
-    if [ -f $settingsFile ] ;then
-        findMarker="natural_scroll"
-        customtext="$(cat $settingsFile)"
-        _replaceLineInFile "$findMarker" "$customtext" "$targetFile"
-        echo "keyboard natural_scroll restored."
-    fi
-
-    # Restore Start Swaylock
-    targetFile="$HOME/dotfiles/hypr/scripts/lockscreentime.sh"
-    settingsFile="$HOME/dotfiles/.settings/hypr_lockscreen"
-    if [ -f $settingsFile ] ;then
-        startMarker="START SWAYIDLE"
-        endMarker="END SWAYIDLE"
-        customtext="$(cat $settingsFile)"
-        _replaceInFile "$startMarker" "$endMarker" "$customtext" "$targetFile"
-        echo "Swaylock start restored."
-    fi
-
-    echo ""
 fi

.install/settings.sh

@@ -0,0 +1,17 @@
+if [ "$restored" == "1" ]; then
+    if [ -f ~/dotfiles/.settings/settings.json ] ;then
+        echo -e "${GREEN}"
+        figlet "Restore Settings"
+        echo -e "${NONE}"
+        python .install/restore.py
+    fi
+else
+    if [ -f ~/dotfiles/.settings/settings.json ] ;then
+        rm ~/dotfiles/.settings/settings.json
+        echo ":: settings.json removed"
+    fi
+    if [ -f ~/.cache/.themestyle.sh ] ;then
+        rm ~/.cache/.themestyle.sh
+        echo ":: .themestyle.sh removed"
+    fi
+fi

.install/templates/keyboard-default.conf

@@ -4,10 +4,12 @@
 # -----------------------------------------------------
 input {
     kb_layout = KEYBOARD_LAYOUT
-    kb_variant = 
+    kb_variant = KEYBOARD_VARIANT
     kb_model =
     kb_options =
-
+    numlock_by_default = true
+    mouse_refocus = false
+    
     # For United States
     # kb_layout = us
     # kb_variant = intl
@@ -16,7 +18,17 @@ input {
 
     follow_mouse = 1
     touchpad {
+        # for desktop
         natural_scroll = false
+        
+        # for laptop
+        # natural_scroll = yes
+        # middle_button_emulation = true
+        # clickfinger_behavior = 1          
     }
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
 }
+
+gestures {
+    workspace_swipe = true
+}

.install/templates/keyboard-laptop.conf

@@ -0,0 +1,35 @@
+# ----------------------------------------------------- 
+# Keyboard Layout
+# https://wiki.hyprland.org/Configuring/Variables/#input
+# -----------------------------------------------------
+input {
+    kb_layout = KEYBOARD_LAYOUT
+    kb_variant = KEYBOARD_VARIANT
+    kb_model =
+    kb_options =
+    numlock_by_default = true
+    mouse_refocus = false
+    
+    # For United States
+    # kb_layout = us
+    # kb_variant = intl
+    # kb_model = pc105
+    # kb_options =
+
+    follow_mouse = 1
+    touchpad {
+        # for desktop
+        # natural_scroll = false
+
+        # for laptop
+        natural_scroll = true
+        middle_button_emulation = true
+        clickfinger_behavior = true
+        disable_while_typing = true
+    }
+    sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+}
+
+gestures {
+    workspace_swipe = true
+}

.install/updatesystem.sh

@@ -0,0 +1,19 @@
+# ------------------------------------------------------
+# Update System
+# ------------------------------------------------------
+
+echo -e "${GREEN}"
+figlet "System Update"
+echo -e "${NONE}"
+echo "It's important that your system is up-to-date before you proceed."
+echo 
+if gum confirm "Do you want to update your system with yay now?" ;then
+    echo ":: Update started"
+    yay
+elif [ $? -eq 130 ]; then
+    echo ":: Installation canceled."
+    exit 130
+else
+    echo ":: System update skipped"
+fi
+echo

.install/vm.sh

@@ -4,11 +4,21 @@ echo -e "${GREEN}"
 figlet "KVM VM"
 echo -e "${NONE}"
     echo "The script has detected that you run the installation in a KVM virtual machine."
-    if gum confirm "Do you want to install the KVM environment variables?" ;then
+    echo
-        echo "source = ~/dotfiles/hypr/conf/environments/kvm.conf" >  ~/dotfiles-versions/$version/hypr/conf/environment.conf
+    if grep -Fxq "kvm.conf" ~/dotfiles-versions/$version/hypr/conf/environment.conf
-        echo "Environment set to KVM."
+    then
+        echo ":: KVM Environment already set."
+    else
+        if gum confirm "Do you want to install the KVM environment variables?" ;then
+            echo "source = ~/dotfiles/hypr/conf/environments/kvm.conf" >  ~/dotfiles-versions/$version/hypr/conf/environment.conf
+            echo "Environment set to KVM."
+        fi
     fi
-    if gum confirm "Do you want to install the QEMU guest agent?" ;then
+    if [[ $(_isInstalledPacman "${pkg}") == 0 ]]; then
-        _installPackagesPacman "qemu-guest-agent";
+        echo ":: Qemu Guest Agent already installed"
+    else
+        if gum confirm "Do you want to install the QEMU guest agent?" ;then
+            _installPackagesPacman "qemu-guest-agent";
+        fi
     fi
 fi

.install/wallpaper.sh

@@ -5,16 +5,17 @@ echo -e "${GREEN}"
 figlet "Wallpapers"
 echo -e "${NONE}"
 if [ ! -d ~/wallpaper ]; then
-    echo "Do you want to download the wallpapers from repository https://gitlab.com/stephan-raabe/wallpaper/ ?"
+    echo "Do you want to download the wallpapers from repository https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ?"
     echo "If not, the script will install 3 default wallpapers in ~/wallpaper/"
     echo ""
     if gum confirm "Do you want to download the repository?" ;then
-        wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
+        # wget -P ~/Downloads/ https://gitlab.com/stephan-raabe/wallpaper/-/archive/main/wallpaper-main.zip
-        unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
+        # unzip -o ~/Downloads/wallpaper-main.zip -d ~/Downloads/
-        if [ ! -d ~/wallpaper/ ]; then
+        # if [ ! -d ~/wallpaper/ ]; then
-            mkdir ~/wallpaper
+        #     mkdir ~/wallpaper
-        fi
+        # fi
-        cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        # cp ~/Downloads/wallpaper-main/* ~/wallpaper/
+        git clone https://gitea.phywyj.dynv6.net/wyj/wallpaper.git ~/wallpaper
         echo "Wallpapers from the repository installed successfully."
     elif [ $? -eq 130 ]; then
         exit 130

.install/yay.sh

@@ -1,12 +1,12 @@
 # ------------------------------------------------------
 # Check if yay is installed
 # ------------------------------------------------------
-echo -e "${GREEN}"
-figlet "yay"
-echo -e "${NONE}"
 if sudo pacman -Qs yay > /dev/null ; then
     echo ":: yay is already installed!"
 else
+    echo -e "${GREEN}"
+    figlet "yay"
+    echo -e "${NONE}"
     echo ":: yay is not installed. Starting the installation!"
     _installPackagesPacman "base-devel"
     SCRIPT=$(realpath "$0")
@@ -18,4 +18,4 @@ else
     cd $temp_path
     echo ":: yay has been installed successfully."
 fi
-echo ""
+echo

.install/zsh.sh

@@ -0,0 +1,22 @@
+# ------------------------------------------------------
+# install zsh and zinit
+# ------------------------------------------------------
+packagesPacman=("zsh");
+
+echo "Please select the zsh plugin manager:"
+zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit")
+if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then
+    source .install/install-packages.sh
+    if [ ! -d ~/.oh-my-zsh ]; then
+        RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+    fi
+    git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
+    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+    git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
+    _installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~/.zshrc
+else
+    packagesYay=("zinit");
+    source .install/install-packages.sh
+    _installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc
+fi
+_installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/

.install/zshfish.sh

@@ -0,0 +1,25 @@
+# ------------------------------------------------------
+# Select additional shell
+# ------------------------------------------------------
+echo -e "${GREEN}"
+figlet "Zsh Fish"
+echo -e "${NONE}"
+echo "Please select if you want to install zsh or fish."
+echo
+zshfish=$(gum choose --no-limit --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "zsh" "fish")
+
+if [ -z "${zshfish}" ] ;then
+    echo ":: No shell selected. Keep using bash."
+else
+    echo "Please select your default shell."
+	echo
+	shell=$(echo -e "bash\n$zshfish" | gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) ")
+    if [[ $zshfish == *"zsh"* ]]; then
+		echo ":: zsh selected"
+		source .install/zsh.sh
+	fi
+	if [[ $zshfish == *"fish"* ]]; then
+		echo ":: fish selected"
+		source .install/fish.sh
+	fi
+fi

.settings/blur.sh

@@ -0,0 +1 @@
+50x30

.settings/browser.sh

@@ -1 +1 @@
-chromium
+google-chrome-stable

.settings/editor.sh

@@ -0,0 +1 @@
+~/dotfiles/.settings/terminal.sh -e vim

.settings/eww-monitor.sh

@@ -0,0 +1 @@
+auto

.settings/filemanager.sh

@@ -1 +1 @@
-thunar
+nautilus

.settings/hyprpaper.tpl

@@ -0,0 +1,8 @@
+# Preload Wallpapers
+preload = WALLPAPER
+
+# Set Wallpapers
+wallpaper = ,WALLPAPER
+
+# Disable Splash
+splash = false

.settings/hyprshade.sh

@@ -0,0 +1 @@
+hyprshade_filter="blue-light-filter"

.settings/networkmanager.sh

@@ -1 +0,0 @@
-nm-connection-editor

.settings/rofi-border-radius.rasi

@@ -0,0 +1,3 @@
+* {
+    border-radius:  15px;
+}

.settings/rofi-border.rasi

@@ -0,0 +1,3 @@
+* {
+    border-width:   2px;
+}

.settings/rofi-font.rasi

@@ -0,0 +1 @@
+configuration { font: "Fira Sans 11"; }

.settings/software.sh

@@ -1 +0,0 @@
-alacritty -e pacseek

.settings/swayidle.sh

@@ -1,2 +0,0 @@
-timeswaylock=600
-timeoff=660

.settings/terminal.sh

@@ -1 +1 @@
-alacritty
+kitty

.settings/wallpaper-effect.sh

@@ -0,0 +1 @@
+off

.settings/wallpaper-engine.sh

@@ -0,0 +1 @@
+hyprpaper

.settings/wallpaper-folder.sh

@@ -0,0 +1,2 @@
+# Enter the path to the folder that includes your wallpapers
+wallpaper_folder=$HOME/wallpaper

.version/name

@@ -1 +1 @@
-2.8RC3
+2.9.1.2

.version/version

@@ -1 +1 @@
-280
+2912

.zshrc_ohmyzsh

@@ -0,0 +1,88 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
+# -----------------------------------------------------
+# Oh my zsh settings
+# -----------------------------------------------------
+
+# Path to your oh-my-zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
+
+# ZSH_THEME="robbyrussell"
+ZSH_THEME="powerlevel10k/powerlevel10k"
+
+# Uncomment the following line to use hyphen-insensitive completion.
+# Case-sensitive completion must be off. _ and - will be interchangeable.
+# HYPHEN_INSENSITIVE="true"
+
+zstyle ':omz:update' mode auto
+
+# Uncomment the following line to display red dots whilst waiting for completion.
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+COMPLETION_WAITING_DOTS="true"
+
+# -----------------------------------------------------
+# Plugins
+# -----------------------------------------------------
+plugins=(git colored-man-pages eza z sudo zsh-autosuggestions fast-syntax-highlighting)
+
+source $ZSH/oh-my-zsh.sh
+
+# -----------------------------------------------------
+# Variables
+# -----------------------------------------------------
+export PATH=$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+# export MANPATH="/usr/local/man:$MANPATH"
+
+export LANG=en_US.UTF-8
+
+export EDITOR='nvim'
+
+export MAKEFLAGS='-j$(nproc)'
+export CFLAGS='-march=native -O2 -pipe'
+
+# -----------------------------------------------------
+# Alias
+# -----------------------------------------------------
+alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
+alias wakemac="wakeonlan  18:C0:4D:8D:56:0E"
+alias ls="eza --icons=auto"
+alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
+alias bat="bat --paging=never"
+alias code="code --ozone-platform=wayland --enable-wayland-ime"
+# fix ssh if in kitty
+if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
+    alias ssh="kitty +kitten ssh"
+fi
+
+# -----------------------------------------------------
+# Completion
+# -----------------------------------------------------
+[[ -f /home/wyj/.dart-cli-completion/zsh-config.zsh ]] && . /home/wyj/.dart-cli-completion/zsh-config.zsh || true
+
+# -----------------------------------------------------
+# evals
+# -----------------------------------------------------
+eval $(thefuck --alias)
+eval "$(fzf --zsh)"
+
+# -----------------------------------------------------
+# PYWAL
+# -----------------------------------------------------
+cat ~/.cache/wal/sequences
+
+# -----------------------------------------------------
+# Custom
+# -----------------------------------------------------
+[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh
+
+# -----------------------------------------------------
+# miscs
+# -----------------------------------------------------
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh

.zshrc_zinit

@@ -0,0 +1,64 @@
+# ---------------------------------------------------
+# Zinit and plugins
+# ---------------------------------------------------
+source /usr/share/zinit/zinit.zsh
+
+# Load powerlevel10k theme
+zinit ice depth"1" # git clone depth
+zinit light romkatv/powerlevel10k
+
+# Load plugins
+zinit light zsh-users/zsh-autosuggestions
+zinit light zdharma-continuum/fast-syntax-highlighting
+# oh-my-zsh plugins
+zi snippet OMZL::git.zsh
+zi snippet OMZP::git
+zi snippet OMZP::sudo
+zi snippet OMZP::colored-man-pages
+zi snippet OMZP::eza
+zi snippet OMZP::z
+# others
+zplugin ice as"program" pick"bin/git-dsf"
+zplugin light zdharma-continuum/zsh-diff-so-fancy
+
+# ----------------------------------------------------
+# Variables
+# ----------------------------------------------------
+export PATH=$HOME/bin:$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
+export EDITOR=vim
+
+# ----------------------------------------------------
+# Alias
+# ----------------------------------------------------
+alias sshkoko="TERM=xterm-256color ssh ywang2020@koko-login.hpc.fau.edu"
+alias wakemac="wakeonlan  18:C0:4D:8D:56:0E"
+alias eza="eza --icons=auto"
+alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
+alias bat="bat --paging=never"
+
+# -----------------------------------------------------
+# evals
+# -----------------------------------------------------
+eval $(thefuck --alias)
+eval "$(fzf --zsh)"
+
+# -----------------------------------------------------
+# Miscs
+# -----------------------------------------------------
+# fix ssh if in kitty
+if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
+    alias ssh="kitty +kitten ssh"
+fi
+
+# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
+[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
+
+# -----------------------------------------------------
+# PYWAL
+# -----------------------------------------------------
+cat ~/.cache/wal/sequences
+
+# -----------------------------------------------------
+# Custom
+# -----------------------------------------------------
+[[ ! -f ~/.custom.zsh ]] || source ~/.custom.zsh

CHANGELOG.md

@@ -1,3 +1,127 @@
+Version 2.9.1.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
+--------------------------------------------------------
+- Workspaces module in waybar updated to enable scroll to change the workspace https://gitlab.com/stephan-raabe/dotfiles/-/merge_requests/114
+- More functions deactivated in Game Mode (SUPER+ALT+G)
+- Keybindings rofi menu updated with keybinding description. Open with right mouse click on Apps waybar module
+- Fixed bug of ML4W Hyprland Settings App with Hyprland 0.41.0
+
+Version 2.9.1.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1.1
+--------------------------------------------------------
+- New installation method for sddm sugar candy theme. Instead of using yay, the installer will download the ZIP from the repository, extract it to the Downloads folder and copy the files to the destination folder.
+- A gamemode can be toggled with SUPER+ALT+G. The gaming mode will disable the animations and blur.
+- Added a black ML4W Icon for black waybar themes
+
+Version 2.9.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9.1
+--------------------------------------------------------
+- Hyprpaper is the default wallpaper engine. swww will not be installed by the installer anymore. You can still switch to swww in the Dotfiles Settings App (System tab) but you need to install swww manually with yay -S swww
+- pfetch has been replaced with fastfetch (requires an update of the .bashrc) https://gitlab.com/stephan-raabe/dotfiles/-/issues/315
+- Directory for wallpapers can be customized with new .settings/wallpaper-folder.sh https://gitlab.com/stephan-raabe/dotfiles/-/issues/325
+- Screen shading possible with hyprshade. SUPER+SHIFT+S to toggle hyprshade. The shader can be defined with the shader module in waybar or in ~/dotfiles/.settings/hyprshade.sh 
+For auto-activation at a dedicated time please set the filter to off and follow the instructions here https://github.com/loqusion/hyprshade. https://gitlab.com/stephan-raabe/dotfiles/-/issues/329
+- Nautilus defined as the new default file manager. Thunar is still available.
+- Waybar can be toggles with SUPER+CTRL+B https://gitlab.com/stephan-raabe/dotfiles/-/issues/299
+- Installation script optimized for new gum
+- During the installation of the keyboard, it can be selected between a desktop and laptop optimized configuration https://gitlab.com/stephan-raabe/dotfiles/-/issues/319. 
+- RDP launch script updated https://gitlab.com/stephan-raabe/dotfiles/-/issues/336
+- Nvidia environment configuration updated https://gitlab.com/stephan-raabe/dotfiles/-/issues/327
+- Pacman can be configured for parallel downloads, colors and more during the installation and with the ML4W Settings app https://gitlab.com/stephan-raabe/dotfiles/-/issues/316
+- Image conversions with imagemagick can be enabled for wallpapers. Right click on wallpaper module in waybar. You can add more effects in ~/dotfiles/hypr/effects/wallpaper
+- ChatGPT Window opens on the left screen side in floating mode
+- New default wallpaper 
+- Added hypridle inhibitor waybar module to toggle screen locking with hyprlock
+- Tooltips added to all waybar modules
+
+Version 2.9
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.9
+--------------------------------------------------------
+- New Hyprland Settings App. Can be launched from the App Launcher, the ML4W Welcome App or the new ML4W logo context menu (right click)
+- Added sidebar menu. Start with click on ML4W Logo in Waybar. Right click starts the welcome app
+- Updated hyprlock screen showing the wallpaper in a circle. hyprlock 3 required
+- Waybar Taskbar Module hidden by default. Can be enabled again in the ML4W Settings App
+- Hyprpaper is now the default wallpaper engine. swww can be activiated 
+- Animations can be disabled in the Dotfiles Settings app
+- Animations can be toggled (enabled/disabled) temporarily with SUPER + SHIFT + A
+- Keyboard layout is part of the system information module of waybar
+- nm-applet can be started from the ML4W Welcome App menu Settings/System
+- New diagnosis features checks that essential command are available. Enter ml4w-diagnosis in a terminal or from the ML4W Welcome App
+
+Version 2.8.4
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.4
+--------------------------------------------------------
+- In the ML4W Dotfiles Settings App you can now switch between the wallpaper applications swww or hyprpaper. In case of issues with the default application swww you can select hyprpaper. The wallpaper application can also be disabled but background images for wlogout, hyprlock and rofi will be generated with the selected wallpaper. 
+PLEASE NOTE: Logout & Login is required after a change.
+- New folder structure for backups: dotfiles-versions/backup holds the latest backup, dotfiles-versions/archive stores archived backups
+- Installer can now backup configurations in .config before overwriting by dotfiles
+- You can uninstall the ML4W dotfiles with the new uninstaller script starting from the ML4W dotfiles or by executing ~/dotfiles/uninstall.sh
+- Using the hypridle.conf suggested by https://wiki.hyprland.org/Hypr-Ecosystem/hypridle/
+
+Version 2.8.3.4
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.3.4
+--------------------------------------------------------
+- Fix swww gray background issue. New command on autostart.conf is 
+exec-once = swww init || swww-daemon --format xrgb
+- Using blurred version of background image for wlogout
+- Add progress bar to dunst notification for wallpaper change and processing
+
+Version 2.8.3.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.3.2
+--------------------------------------------------------
+- Replace rofi with rofi-lbonn-wayland to get rofi wayland support
+- Several modifications in the ML4W Welcome App
+- ML4W Settings App allows to set between 1 and 10 Hyprland workspaces
+
+Version 2.8.3.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.3.1
+--------------------------------------------------------
+- Add compatibility with Hyprland 0.37.1
+
+Version 2.8.3
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.3
+--------------------------------------------------------
+- New ML4W Dotfiles Settings App based on GTK4 with many new customization options
+- Hyprlock with blurred version of the current wallpaper as background. Blur strength can be adjusted in the ML4W Dotfiles Settings app
+- Hyprlock now showing the current time and username
+
+Version 2.8.2.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.2
+--------------------------------------------------------
+- ML4W Welcome app includes more settings for hypridle. Incl. recommendation from Hyprland Wiki
+
+Version 2.8.2
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.2
+--------------------------------------------------------
+General:
+- Force installation of sddm to fix theme issue with sddm-sugar-candy theme. sddm-git doesn't work with themes at the moment
+- snapshot.sh script check now for required timeshift and (optional) grub-btrfs packages
+- Waybar Bluetooth module now hides automatically if no bluetooth device is detected. Please check that "bluetooth" is not commented out in ~/dotfiles/waybar/modules.json
+- Replace hypridle-git with hypridle and hyprlock-git with hyprlock
+- Desktop file for ML4W Welcome App to be listed in application launcher + icon
+
+Version 2.8.1
+https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8.1
+--------------------------------------------------------
+General:
+- Swayidle replaced with hypridle (config in dotfiles/hypr/hypridle.conf)
+- Swaylock replaced with hyprlock (config in dotfiles/hypr/hyprlock.conf)
+- New default wallpaper in Hyprland style
+- xarchiver and zip added for thunar
+- Rofi border width can be adjusted in dotfiles/.settings/rofi-border.rasi
+- emote added to select Emojis (SUPER+.)
+
+ML4W Welcome App: 
+- Opens Hyprland systeminfo from the about menu
+- Timeshift can be installed from the settings menu
+- Terminal for Thunar can be set from the settings menu
+
+Hyprland:
+- Bugfix timeshift detection in installupdates.sh 
+
+Qtile:
+- Polybar removed from the dotfiles
+
 Version 2.8
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.8
 --------------------------------------------------------
@@ -9,6 +133,7 @@ Hyprland:
 - New waybar theme ml4w-minimal
 - New window animation variation animation-moving.conf
 - New AI icon to open ChatGPT
+- Hyprland installation with hyprland package only. hyprland-git removed from the installer
 
 Version 2.7.2
 https://gitlab.com/stephan-raabe/dotfiles/-/releases/2.7.2

README.md

@@ -1,347 +1,53 @@
-# ML4W dotfiles 2.8RC3
+# ML4W Dotfiles 2.9.1.2
 
-This is my configuration of Hyprland (Wayland) and Qtile (X11) for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
+An advanced configuration of Hyprland for Arch Linux based distributions. This package includes an installation script to install and setup the required components.
 
-<a href="https://gitlab.com/stephan-raabe/dotfiles/-/blob/main/screenshots/v28/screenshot-28-1.png?ref_type=heads" target="_blank"><img src="screenshots/v28/screenshot-28-1.png" /></a>
+[![Screenshot](screenshots/screenshot2.png "Screenshot")](screenshots/screenshot2.png)
 
-PLEASE NOTE: This branch is the rolling release of the ML4W dotfiles and includes the latest changes. 
+The ML4W Dotfiles are available as 
 
-Latest official release
+- main release (Official release): [https://gitlab.com/stephan-raabe/dotfiles](https://gitlab.com/stephan-raabe/dotfiles)
+- rolling release (Development release): [https://gitlab.com/stephan-raabe/dotfiles/-/tree/dev](https://gitlab.com/stephan-raabe/dotfiles/-/tree/dev)
 
-You can find the installation video on YouTube: <a href="https://youtu.be/kHG5czrQ7WA" target="_blank">Install Arch Linux with Hyprland & Qtile</a>
+YouTube Video [https://youtu.be/HMxHUvN6VGo](https://youtu.be/HMxHUvN6VGo)
 
-[TOC]
+## Installation
 
-# Installation
+The installation should work on all Arch Linux based distributions. [You can find more information here](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/home).
 
-To make it easy for you to get started with the ML4W dotfiles, here's a list of recommended next steps.
+The easiest way is to use the setup.sh script. The script will download all files from GitLab and start the installation automatically.
 
-The package includes an installation script install.sh that will guide you through all steps of the installation or update process.
+Just copy/enter the following command into your terminal.
-
-## Supported platforms
-
-The dotfiles are tested with the following Arch based distributions:
-
-- Arch Linux (recommended)
-- Manjaro Linux
-- Arco Linux
-- EndeavourOS
-
-But the installation should work on all Arch Linux based distributions as well.
-
-For Arco Linux users: Please reinstall/force the installation of all packages during the installation/update process of the install script. The script will also offer to remove ttf-ms-fonts if installed to avoid issues with icons on waybar. 
-
-## Before you start
-
-PLEASE BACKUP YOUR EXISTING .config FOLDER WITH YOUR DOTFILES BEFORE STARTING THE SCRIPTS FOR INITIAL INSTALLTION.
-PLEASE READ THIS README until the end before starting the installation.
-
-The installation script will try to create a backup from an previous dotfiles installation.
-
-Please note: To get the default Linux folder structure incl. Downloads, etc please install the packages xdg-user-dirs and run xdg-user-dirs-update.
-
-## Reference Installation
-
-The reference installation on the dotfiles is based on Arch Linux installed with a minimal profile. 
-
-Please watch the video on YouTube: https://youtu.be/kHG5czrQ7WA
-
-## Installation with GIT of Rolling Release
 
 ```
-# 1.) Change into your Downloads folder
+bash <(curl -s https://gitlab.com/stephan-raabe/dotfiles/-/raw/main/setup.sh)
-cd ~/Downloads
-
-# 2.) Clone the dotfiles repository into the Downloads folder
-git clone https://gitlab.com/stephan-raabe/dotfiles.git
-
-# 3.) Change into the dotfiles folder
-cd dotfiles
-
-# 4.) Start the installation
-./install.sh
-
 ```
 
-## Installation with GIT of the latest release
+> PLEASE NOTE: Every Linux distribution, setup and personal configuration can be different. Therefore, I cannot guarantee that the ML4W Dotfiles will work everywhere. Installation at your own risk.
 
-```
+## Wiki
-# 1.) Change into your Downloads folder where you have downloaded the release to
-cd ~/Downloads
 
-# 2.) Unzip
+You can find the complete documentation of the ML4W Dotfiles in the Wiki. <b>[Open the Wiki here](https://gitlab.com/stephan-raabe/dotfiles/-/wikis/home)</b>
-git clone --branch 2.7.2 https://gitlab.com/stephan-raabe/dotfiles.git
 
-# 3.) Change into the new dotfiles folder
+## Contributing
-cd dotfiles
 
-# 4.) Start the installation to update
+Thanks for using the ML4W Dotfiles on your system. If you find a problem or a bug, please [report your issue on this page](https://gitlab.com/stephan-raabe/dotfiles/-/issues/?sort=created_date&state=opened).
-./install.sh
 
-```
+You can also visit the [ML4W Discord Server](https://discord.gg/c4fJK7Za3g) to start a discussion with other users.
 
-## Update with GIT
+## Screenshots
 
-```
+[![Screenshot](screenshots/screenshot1.png "Screenshot")](screenshots/screenshot1.png)
-# 1.) Change into your Downloads folder
-cd ~/Downloads/dotfiles
 
-# Switch to rolling release
+[![Screenshot](screenshots/screenshot3.png "Screenshot")](screenshots/screenshot3.png)
-# git checkout origin/main
 
-# Switch to other version
+[![Screenshot](screenshots/screenshot4.png "Screenshot")](screenshots/screenshot5.png)
-# git checkout 2.7.2
 
-# 2.) Pull the latest version and update the repository
+## Wallpaper repository
-git stash; git pull
-
-# 3.) Start the installation to update
-./install.sh
-
-```
-
-## Dotfiles Installer
-
-You can also use the dotfiles installer script to download and install the latest release: https://gitlab.com/stephan-raabe/installer
-
-## Installation Hook
-
-The installation script will prepare the configuration files in a folder ~/dotfiles-versions/[version] before copying into the final destination in ~/dotfiles
-
-If you want to modify the installation files just before the copy procedure starts, you can create a file hook.sh in the folder ~/dotfiles-versions
-
-You can delete folders and files or update existing configurations.
-
-```
-#!/bin/bash
-rm -rf ~/dotfiles-versions/$version/vim/
-rm -rf ~/dotfiles-versions/$version/nvim/
-```
-
-This script will for example remove the vim and nvim folder before the installation. The symbolic link will not be created because the source folder doesn't exits.
-
-You can find a template in .install/templates/hook.sh
-
-## Hyprland & NVIDIA 
-
-Users have reported that Hyprland with dotfiles could be installed successfully on setups with NVDIA GPUs using the nouveau open source drivers. 
-
-There is no official Hyprland support for Nvidia hardware. However, you might make it work properly following this page.
-https://wiki.hyprland.org/Nvidia/
-
-## Launch Hyprland from tty
-
-The suggested method to start Hyprland is from tty with the command Hyprland bacause login managers (display managers) are not official supported (https://wiki.hyprland.org/Getting-Started/Master-Tutorial/#launching-hyprland)
-
-```
-# Start Hyprland
-Hyprland
-```
-
-You can install a custom tty login issue (layout) with the dotfiles installer.
-
-## Launch Hyprland with a Display Manager
-
-I made good experiences with the Display Manager SDDM (https://github.com/sddm/sddm). Also gdm could work. 
-
-Important is that you use the package sddm-git. You can replace sddm with sddm-git with
-
-```
-yay -S sddm-git
-```
-
-The dotfiles installation script will offer to deactivate the installed display manager and to activate  SDDM. 
-
-The dotfiles package also includes a configuration for the SDDM theme sdd-sugar-candy (https://github.com/Kangie/sddm-sugar-candy) and a configuration to run SDDM in X11 mode to get the best compatibility.
-
-With the Hyprland settings script you can copy the current wallpaper into SDDM and use it as a background.
-
-Please check the troubleshooting section in case of issues.
-
-## Installation in a KVM virtual machine
-
-Qtile X11 works fine in a KVM virtual machine. The Hyprland performance is low but it's enough for testing new features.
-
-In virt-manager please make sure that 3D acceleration is enabled in Video Virtio and the Listen type is set to None in Display Spice.
-
-To fix the mouse issue on Hyprland, open the Hyprland settings with <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>S</kbd> and select in Environments the variation kvm.conf
-
-## Base Hyprland installation with Hyperland Starter
-
-If you want to install only the core packages of Hyprland as a starting point for your Hyprland experiments please also try my Hyprland Starter script: https://gitlab.com/stephan-raabe/hyprland-starter
-
-# Some important key bindings
-
-- <kbd>SUPER</kbd> + <kbd>RETURN</kbd>: Alacritty
-- <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>RETURN</kbd>: rofi application launcher
-- <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>W</kbd>: Change wallpaper
-- <kbd>SUPER</kbd> + <kbd>PRINT</kbd>: Screenshot
-- <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>Q</kbd>: Logout screen
-- <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>S</kbd>: Settings script on Hyprland
-- <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>B</kbd>: Reload waybar on Hyprland
-
-All keybindings for Hyprland with right mouse click on Apps in waybar or here: 
-https://gitlab.com/stephan-raabe/dotfiles/-/blob/main/hypr/conf/keybindings.conf
-
-All keybindings for Qtile: https://gitlab.com/stephan-raabe/dotfiles/-/blob/main/qtile/config.py
-
-# Hyprland
-
-<a href="https://gitlab.com/stephan-raabe/dotfiles/-/blob/main/screenshots/v28/screenshot-28-1.png?ref_type=heads" target="_blank"><img src="screenshots/v28/screenshot-28-1.png" /></a>
-
-<a href="https://gitlab.com/stephan-raabe/dotfiles/-/blob/main/screenshots/v28/screenshot-28-2.png?ref_type=heads" target="_blank"><img src="screenshots/v28/screenshot-28-2.png" /></a>
-
-<a href="https://gitlab.com/stephan-raabe/dotfiles/-/blob/main/screenshots/v28/screenshot-28-3.png?ref_type=heads" target="_blank"><img src="screenshots/v28/screenshot-28-3.png" /></a>
-
-<b><a href="https://gitlab.com/stephan-raabe/dotfiles/-/tree/main/screenshots?ref_type=heads">You can find more screenshots here.</a></b>
-
-<a href="https://youtu.be/e9ro_P9rbFk" target="_blank">Watch on YouTube</a>
-
-## ML4W Welcome App
-
-After starting the ML4W dotfiles for the first time, the ML4W Welcome App appears. This app is the starting point to discover the Hyprland setup.
-
-<img src="screenshots/screenshot-welcome.app.png" />
-
-The welcome screen includes the most important keybindings to open a terminal or a browser.
-
-You can start the ML4W Welcome App by clicking on the L icon on the right side in waybar or be entering ml4w in your terminal (if you're using the .bashrc from the dotfiles).
-
-In the Settings Menu you can access the following functions:
-
-- Update Wallpaper: Opens the wallpaper selector
-- Change Waybar Theme: Opens the waybar theme switcher and gives access to the available themes for the waybar status bar
-- Change GTK Theme: Opens nwg-look to select the theme for GTK 3 applications incl. widgets, icons and cursors
-- Refresh GTK Settings: Reloads the Hyprland GTK configuration (required when changing the mouse cursor)
-- Hyprland Settings: Opens the Hyprland Settings script to customize the look and feel, environment variables, monitor resolution, etc.
-- Network Settings: Select your network configuration incl. WiFi
-- Update your System: Starts the terminal application to update your Arch packages (pacman & yay)
-- Cleanup your System: Removes old orphans and cached files generated during previous installations
-- Reload Waybar: Reloads the waybar
-- Toggle Waybar: You can hide or show waybar when you want to try our other status bars.
-
-You can find the sourcecode of the ML4W Welcome App in this repository:
-https://gitlab.com/stephan-raabe/ml4w-welcome
-
-## Wallpaper and Pywal
-
-Included is a pywal configuration that changes the color scheme based on a randomly selected wallpaper. With the key binding <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>W</kbd> you can change the wallpaper coming from the folder ~/wallpaper/. 
-
-<kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>W</kbd> opens rofi with a list of installed wallpapers in ~/wallpaper/ for your individual selection. 
-
-## Waybar themes and themeswitcher
-
-In addition, you can switch the Waybar Template with <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>T</kbd> or by pressing the "..." icon in Waybar with the themeswitcher. 
-
-The templates are available in ~/dotfiles/waybar/themes. You can add your own personal themes into this folder. 
-
-More information here: https://gitlab.com/stephan-raabe/dotfiles/-/tree/main/waybar
-
-## Hyprland settings
-
-You can open the settings script with <kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>S</kbd> to select variations for your hyprland.conf and customize your desktop even more.
-
-You can create custom variations by copying a file from the ~/dotfiles/hypr/conf subfolders like monitor/default.conf, give the file a custom name (e.g., mymonitor.conf) and select the variation in the settings script in the corresponding section.
-
-You can also edit the file custom.conf which is included at the bottom of the hyprland.conf and can hold you personal configurations.
-
-You can also edit the file directly in the settings script in the section Custom.
-
-## Screensharing and recording
-
-In case you have issues with starting Waybar please make sure that only one xdg-desktop-portal-x is installed additionally to xdg-desktop-portal.
-
-I had several issues with xdg-desktop-portal-wlr on Hyprland and Waybar. Please make sure that xdg-desktop-portal-wlr is uninstalled and xdg-desktop-portal-hyprland is installed.
-
-More information you can find here:
-https://gist.github.com/PowerBall253/2dea6ddf6974ba4e5d26c3139ffb7580
-
-Please note that every Arch Linux system is different and I cannot guarantee that everything works fine on your system.
-
-## Main packages
-
-- Terminal: alacritty
-- Editor: nvim
-- Prompt: starship
-- Icons: Font Awesome
-- Launch Menus: Rofi
-- Colorscheme: pywal
-- Browsers: chromium (brave optional)
-- Filemanager: Thunar
-- Cursor: Bibata Modern Ice
-- Icons: Papirus-Icon-Theme
-- Status Bar: waybar
-- Screenshots: grim & slurp
-- Clipboard Manager: cliphist
-- Logout: wlogout 
-- Screenlock: swaylock-effects
-
-# Qtile X11
-
-<a href="https://youtu.be/e9ro_P9rbFk" target="_blank"><img src="screenshots/v27/screenshot-27-3.png" alt="Click to watch on YouTube" /></a>
-
-<a href="https://youtu.be/e9ro_P9rbFk" target="_blank"><img src="screenshots/v27/screenshot-27-4.png" alt="Click to watch on YouTube" /></a>
-
-## Wallpaper and Pywal
-
-Included is a pywal configuration that changes the color scheme based on a randomly selected wallpaper. With the key binding <kbd>SUPER</kbd> + <kbd>SHIFT</kbd> + <kbd>W</kbd> you can change the wallpaper coming from the folder ~/wallpaper/. 
-
-<kbd>SUPER</kbd> + <kbd>CTRL</kbd> + <kbd>W</kbd> opens rofi with a list of installed wallpapers in ~/wallpaper/ for your individual selection. 
-
-## Main Packages
-
-- Terminal: alacritty
-- Editor: nvim
-- Prompt: starship
-- Icons: Font Awesome
-- Launch Menus: Rofi
-- Colorscheme: pywal
-- Browsers: chromium (brave optional)
-- Filemanager: Thunar
-- Cursor: Bibata Modern Ice
-- Icons: Papirus-Icon-Theme
-- Status Bar: Qtile status bar
-- Compositor: picom
-- Screenshots: scrot
-
-# Troubleshooting
-
-## Missing icons in waybar
-
-In case of missing icons on waybar, it's due to a conflict between several installed fonts (can happen especially on Arco Linux). Please make sure that ttf-ms-fonts is uninstalled and ttf-font-awesome and otf-font-awesome are installed with
-
-```
-yay -R ttf-ms-fonts
-yay -S ttf-font-awesome otf-font-awesome
-```
-
-## SDDM not showing (only black screen with cursor)
-
-Switch to another tty with <kbd>CTRL</kbd> + <kbd>ALT</kbd> + <kbd>F3</kbd> Now you can login with your user.
-
-Start Hyprland with Hyprland.
-
-You can try to reinstall all sddm related packages.
-
-```
-yay -S sddm-git sddm-sugar-candy-git
-```
-
-Or you can install another display manager.
-
-To stop, disable and remove sddm service.
-
-```
-sudo systemctl stop sddm.service
-sudo systemctl disable sddm.service
-sudo rm /etc/systemd/system/display-manager.service
-```
-
-# Wallpaper repository
 
 You can find my wallpaper collection in the repository https://gitlab.com/stephan-raabe/wallpaper
 
-# Special Thanks
+## Special Thanks
 
 THANK YOU very much for all your support, contributions and ideas:
 
@@ -349,17 +55,20 @@ THANK YOU very much for all your support, contributions and ideas:
 - Don Williams: https://github.com/dwilliam62
 - Teodor Orzechowski: https://gitlab.com/sq6gtt
 - Jamie Deppeler: https://gitlab.com/bknight2k
+- Yingjie Wang: https://gitlab.com/GaugeAndGravity
+- Daniel Gerber: https://gitlab.com/dan.john.gerber
+- https://gitlab.com/muee
 
 and many more...
 
 Thanks to all YouTube subscribers for all your great feedback.
 
-# Inspirations
+## Inspirations
 
 The following projects have inspired me:
 
-- https://github.com/dianaw353/hyprland-configuration-rootfs
 - https://github.com/prasanthrangan/hyprdots
 - https://github.com/sudo-harun/dotfiles
+- https://github.com/dianaw353/hyprland-configuration-rootfs
 
 and many more...