diff --git a/diagnose b/diagnose index 65e3e24b1..0b9238c36 100755 --- a/diagnose +++ b/diagnose @@ -55,6 +55,9 @@ ii_check_venv() { which python deactivate } +ii_check_quickshell_version() { + pacman -Q | grep -E 'quickshell|qt6-base' +} e "Checking git repo info" x git remote get-url origin @@ -84,7 +87,7 @@ commands+=(ags agsv1) e "Checking versions" x Hyprland --version -x pacman -Q | grep -E 'quickshell|qt6-base' +x ii_check_quickshell_version e "Finished. Output saved as \"$output_file\"." if ! command -v curl 2>&1 >>/dev/null ;then echo "\"curl\" not found, pastebin upload unavailable.";exit;fi diff --git a/dots/.config/hypr/hyprland/keybinds.conf b/dots/.config/hypr/hyprland/keybinds.conf index f8c29c863..c389df352 100644 --- a/dots/.config/hypr/hyprland/keybinds.conf +++ b/dots/.config/hypr/hyprland/keybinds.conf @@ -200,7 +200,7 @@ bind = Ctrl+Super, Up, workspace, r-5 # [hidden] bind = Ctrl+Super, Down, workspace, r+5 # [hidden] ##! Virtual machines -bind = Super+Alt, F1, exec, notify-send 'Entered Virtual Machine submap' 'Keybinds disabled. Hit Ctrl+Super+F11 to escape' -a 'Hyprland' && hyprctl dispatch submap virtual-machine # Disable keybinds +bind = Super+Alt, F1, exec, notify-send 'Entered Virtual Machine submap' 'Keybinds disabled. Hit Super+Alt+F1 to escape' -a 'Hyprland' && hyprctl dispatch submap virtual-machine # Disable keybinds submap = virtual-machine bind = Super+Alt, F1, exec, notify-send 'Exited Virtual Machine submap' 'Keybinds re-enabled' -a 'Hyprland' && hyprctl dispatch submap global # [hidden] submap = global diff --git a/sdata/step/3.install-files.sh b/sdata/step/3.install-files.sh index f155d0b0c..7918f0ce0 100644 --- a/sdata/step/3.install-files.sh +++ b/sdata/step/3.install-files.sh @@ -41,10 +41,10 @@ function backup_clashing_targets(){ args_includes+=(--include="$current_target") fi done - args_includes+=(--exclude="*") + args_includes+=(--exclude='*') x mkdir -p $backup_dir - x rsync -av --progress "${arg_includes[@]}" "$target_dir/" "$backup_dir/" + x rsync -av --progress "${args_includes[@]}" "$target_dir/" "$backup_dir/" } function ask_backup_configs(){