Updates

mylinuxforwork · Dec 23, 2024 · a820233 · a820233
1 parent c073ccf
commit a820233
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 32 deletions.
diff --git a/lib/install/dotfiles.sh b/lib/install/dotfiles.sh
@@ -31,11 +31,6 @@ source $install_directory/dotfiles/backup.sh
 # ----------------------------------------------------- 
 source $install_directory/dotfiles/preparation.sh
 
-# ----------------------------------------------------- 
-# Check if running in Qemu VM
-# ----------------------------------------------------- 
-source $install_directory/dotfiles/vm.sh
-
 # ----------------------------------------------------- 
 # Install SDDM
 # -----------------------------------------------------

diff --git a/lib/install/dotfiles/keyboard.sh b/lib/install/dotfiles/keyboard.sh
@@ -57,15 +57,7 @@ _keyboard_confirm() {
 
         _confirmKeyboard
 
-        if gum confirm "Are you using a laptop and would you like to enable the laptop presets?"; then
-            cp $template_directory/keyboard-laptop.conf $ml4w_directory/$version/.config/hypr/conf/keyboard.conf
-            echo "source = ~/.config/hypr/conf/layouts/laptop.conf" > $ml4w_directory/$version/.config/hypr/conf/layout.conf
-        elif [ $? -eq 130 ]; then
-            _writeCancel
-            exit 130
-        else
-            cp $template_directory/keyboard-default.conf $ml4w_directory/$version/.config/hypr/conf/keyboard.conf
-        fi
+        cp $template_directory/keyboard-default.conf $ml4w_directory/$version/.config/hypr/conf/keyboard.conf
 
         SEARCH="KEYBOARD_LAYOUT"
         REPLACE="$keyboard_layout"

diff --git a/lib/install/dotfiles/settings.sh b/lib/install/dotfiles/settings.sh
@@ -173,24 +173,6 @@ if [ -f ~/.config/ml4w/settings/waybar_window.sh ] ;then
     _writeLog 1 "waybar_window restored"
 fi
 
-# Replace waybar_settings
-if [ -f ~/.config/ml4w/settings/waybar_settings.sh ] ;then
-    replace_value=$(cat ~/.config/ml4w/settings/waybar_settings.sh)
-    search_str="settings"
-    if [[ $replace_value == "True" ]] ;then
-        replace_str="\"group\/settings\","
-    else
-        replace_str="\/\/\"group\/settings\","
-    fi
-    _replaceLineInFileCheckpoint $search_str $replace_str "modules-left" "$HOME/.config/waybar/themes/ml4w/config"
-    _replaceLineInFileCheckpoint $search_str $replace_str "modules-left" "$HOME/.config/waybar/themes/ml4w-blur/config"
-    _replaceLineInFileCheckpoint $search_str $replace_str "modules-left" "$HOME/.config/waybar/themes/ml4w-blur-bottom/config"
-    _replaceLineInFileCheckpoint $search_str $replace_str "modules-left" "$HOME/.config/waybar/themes/ml4w-bottom/config"
-    _replaceLineInFileCheckpoint $search_str $replace_str "modules-left" "$HOME/.config/waybar/themes/ml4w-modern/config"
-    _replaceLineInFileCheckpoint $search_str $replace_str "modules-left" "$HOME/.config/waybar/themes/ml4w-minimal/config"
-    _writeLog 1 "waybar_settings restored"
-fi
-
 # Replace waybar_appmenu
 if [ -f ~/.config/ml4w/settings/waybar_appmenu.sh ] ;then
     replace_value=$(cat ~/.config/ml4w/settings/waybar_appmenu.sh)