Merge pull request #605 from JaKooLit/development

Development to main

12 files changed, 108 insertions, 18 deletions

diff --git a/config/hypr/UserConfigs/01-UserDefaults.conf b/config/hypr/UserConfigs/01-UserDefaults.conf
new file mode 100644
index 00000000..6949d277
--- /dev/null
+++ b/config/hypr/UserConfigs/01-UserDefaults.conf
@@ -0,0 +1,18 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+
+# This is a file where you put your own default apps, default search Engine etc
+
+# Set your default editor here uncomment and reboot to take effect.
+# NOTE, this will be automatically uncommented if you select neovim or vim to your default editor
+#env = EDITOR,vim #default editor
+
+# Define preferred text editor for the KooL Quick Settings Menu (SUPER SHIFT E)
+# script will take the default EDITOR and nano as fallback
+$edit=${EDITOR:-nano}
+
+# This two is for UserKeybinds.conf
+$term = kitty # Terminal
+$files = thunar # File Manager
+
+# Default Search Engine for ROFI Search (SUPER S)
+$Search_Engine = "https://www.google.com/search?q={}"
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/UserKeybinds.conf b/config/hypr/UserConfigs/UserKeybinds.conf
index 58fb80ac..55beff2d 100644
--- a/config/hypr/UserConfigs/UserKeybinds.conf
+++ b/config/hypr/UserConfigs/UserKeybinds.conf
@@ -15,7 +15,7 @@ $UserScripts = $HOME/.config/hypr/UserScripts
 # common shortcuts
 #bindr = $mainMod, $mainMod_L, exec, pkill rofi || rofi -show drun -modi drun,filebrowser,run,window # Super Key to Launch rofi menu
 bind = $mainMod, D, exec, pkill rofi || true && rofi -show drun -modi drun,filebrowser,run,window # Main Menu (APP Launcher)
-bind = $mainMod, B, exec, xdg-open "http:// &"  # default browser
+bind = $mainMod, B, exec, xdg-open "https://"  # default browser
 bind = $mainMod, A, exec, pkill rofi || true && ags -t 'overview' # desktop overview (if installed)
 bind = $mainMod, Return, exec, $term  #terminal
 bind = $mainMod, E, exec, $files #file manager
diff --git a/config/hypr/UserScripts/WallpaperEffects.sh b/config/hypr/UserScripts/WallpaperEffects.sh
index eb87b97b..7b1cf00b 100755
--- a/config/hypr/UserScripts/WallpaperEffects.sh
+++ b/config/hypr/UserScripts/WallpaperEffects.sh
@@ -105,10 +105,16 @@ sleep 1
 if [[ -n "$choice" ]]; then
   sddm_sequoia="/usr/share/sddm/themes/sequoia_2"
   if [ -d "$sddm_sequoia" ]; then
+  
+	# Check if yad is running to avoid multiple yad notification
+	if pidof yad > /dev/null; then
+	  killall yad
+	fi
+	
 	if yad --info --text="Set current wallpaper as SDDM background?\n\nNOTE: This only applies to SEQUOIA SDDM Theme" \
     --text-align=left \
     --title="SDDM Background" \
-    --timeout=10 \
+    --timeout=5 \
     --timeout-indicator=right \
     --button="yad-yes:0" \
     --button="yad-no:1" \
diff --git a/config/hypr/UserScripts/WallpaperSelect.sh b/config/hypr/UserScripts/WallpaperSelect.sh
index 88b06dd6..cf677f9c 100755
--- a/config/hypr/UserScripts/WallpaperSelect.sh
+++ b/config/hypr/UserScripts/WallpaperSelect.sh
@@ -12,6 +12,12 @@ wallpaper_current="$HOME/.config/hypr/wallpaper_effects/.wallpaper_current"
 iDIR="$HOME/.config/swaync/images"
 iDIRi="$HOME/.config/swaync/icons"
 
+# Check if package bc exists
+if ! command -v bc &>/dev/null; then
+notify-send -i "$iDIR/ja.png" "bc missing" "Install package bc first"
+exit 1
+fi
+
 # variables
 rofi_theme="$HOME/.config/rofi/config-wallpaper.rasi"
 focused_monitor=$(hyprctl monitors -j | jq -r '.[] | select(.focused) | .name')
@@ -28,7 +34,6 @@ adjusted_icon_size=$(echo "$icon_size" | awk '{if ($1 < 15) $1 = 20; if ($1 > 25
 # Setting the rofi override with the adjusted icon size
 rofi_override="element-icon{size:${adjusted_icon_size}%;}"
 
-
 # swww transition config
 FPS=60
 TYPE="any"
@@ -133,10 +138,16 @@ sleep 1
 if [[ -n "$choice" ]]; then
   sddm_sequoia="/usr/share/sddm/themes/sequoia_2"
   if [ -d "$sddm_sequoia" ]; then
+  
+	# Check if yad is running to avoid multiple yad notification
+	if pidof yad > /dev/null; then
+	  killall yad
+	fi
+    
     if yad --info --text="Set current wallpaper as SDDM background?\n\nNOTE: This only applies to SEQUOIA SDDM Theme" \
     --text-align=left \
     --title="SDDM Background" \
-    --timeout=10 \
+    --timeout=5 \
     --timeout-indicator=right \
     --button="yad-yes:0" \
     --button="yad-no:1" \
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index 4ad8e7ca..9a754929 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -9,6 +9,8 @@ $scriptsDir = $HOME/.config/hypr/scripts
 $UserConfigs = $HOME/.config/hypr/UserConfigs
 $UserScripts = $HOME/.config/hypr/UserScripts
 
+bind = $mainMod SHIFT, E, exec, $scriptsDir/Kool_Quick_Settings.sh # Settings Menu KooL Hyprland Settings
+
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod, Q, killactive, #kill
 bind = $mainMod SHIFT, Q, exec, $scriptsDir/KillActiveProcess.sh # Kill active process
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 071e3811..71f243e7 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -36,6 +36,8 @@ source= $UserConfigs/UserKeybinds.conf # Put your own keybinds here
 
 source= $UserConfigs/UserSettings.conf # Main Hyprland Settings.
 
+source= $UserConfigs/01-UserDefaults.conf # settings for User defaults apps
+
 # nwg-displays
 source= $HOME/.config/hypr/monitors.conf
 source= $HOME/.config/hypr/workspaces.conf
\ No newline at end of file
diff --git a/config/hypr/hyprlock-1080p.conf b/config/hypr/hyprlock-1080p.conf
index 5039fd9d..e4837c73 100644
--- a/config/hypr/hyprlock-1080p.conf
+++ b/config/hypr/hyprlock-1080p.conf
@@ -102,7 +102,7 @@ label {
 # USER
 label {
     monitor =
-    text =     $USER
+    text =   $USER
     color = $color13
     outline_thickness = 2
     dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
index 055245d2..5402aee4 100644
--- a/config/hypr/hyprlock.conf
+++ b/config/hypr/hyprlock.conf
@@ -102,7 +102,7 @@ label {
 # USER
 label {
     monitor =
-    text =     $USER
+    text =   $USER
     color = $color13
     outline_thickness = 2
     dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
diff --git a/config/hypr/scripts/Distro_update.sh b/config/hypr/scripts/Distro_update.sh
new file mode 100755
index 00000000..c687ba0c
--- /dev/null
+++ b/config/hypr/scripts/Distro_update.sh
@@ -0,0 +1,40 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+# Simple bash script to check and will try to update your system
+
+# Local Paths
+iDIR="$HOME/.config/swaync/images/ja.png"
+
+# Check for required tools (kitty)
+if ! command -v kitty &> /dev/null; then
+  notify-send -i $iDIR "Need Kitty:" "Kitty terminal not found. Please install Kitty terminal."
+  exit 1
+fi
+
+# Detect distribution and update accordingly
+if command -v paru &> /dev/null || command -v yay &> /dev/null; then
+  # Arch-based
+  if command -v paru &> /dev/null; then
+    kitty -T update paru -Syu
+    notify-send -i $iDIR -u low 'Arch-based system' 'has been updated.'
+  else
+    kitty -T update yay -Syu
+    notify-send -i $iDIR -u low 'Arch-based system' 'has been updated.'
+  fi
+elif command -v dnf &> /dev/null; then
+  # Fedora-based
+  kitty -T update sudo dnf update --refresh -y
+  notify-send -i $iDIR -u low 'Fedora system' 'has been updated.'
+elif command -v apt &> /dev/null; then
+  # Debian-based (Debian, Ubuntu, etc.)
+  kitty -T update sudo apt update && sudo apt upgrade -y
+  notify-send -i $iDIR -u low 'Debian/Ubuntu system' 'has been updated.'
+elif command -v zypper &> /dev/null; then
+  # openSUSE-based
+  kitty -T update sudo zypper dup -y
+  notify-send -i $iDIR -u low 'openSUSE system' 'has been updated.'
+else
+  # Unsupported distro
+  notify-send -i $iDIR -u critical "Unsupported system" "This script does not support your distribution."
+  exit 1
+fi
diff --git a/config/hypr/UserScripts/Kool_Quick_Settings.sh b/config/hypr/scripts/Kool_Quick_Settings.sh
index 7b41512e..a09bced6 100755
--- a/config/hypr/UserScripts/Kool_Quick_Settings.sh
+++ b/config/hypr/scripts/Kool_Quick_Settings.sh
@@ -2,9 +2,13 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # Rofi menu for KooL Hyprland Quick Settings (SUPER SHIFT E)
 
-# Define preferred text editor and terminal
-edit=${EDITOR:-nano}
-tty=kitty
+# Modify this config file for default terminal and EDITOR
+config_file="$HOME/.config/hypr/UserConfigs/01-UserDefaults.conf"
+
+tmp_config_file=$(mktemp)
+sed 's/^\$//g; s/ = /=/g' "$config_file" > "$tmp_config_file"
+source "$tmp_config_file"
+# ##################################### #
 
 # variables
 configs="$HOME/.config/hypr/configs"
@@ -72,7 +76,7 @@ main() {
 
     # Open the selected file in the terminal with the text editor
     if [ -n "$file" ]; then
-        $tty -e $edit "$file"
+        $term -e $edit "$file"
     fi
 }
 
diff --git a/config/hypr/scripts/RofiSearch.sh b/config/hypr/scripts/RofiSearch.sh
index e256253a..e4b4f6af 100755
--- a/config/hypr/scripts/RofiSearch.sh
+++ b/config/hypr/scripts/RofiSearch.sh
@@ -1,18 +1,25 @@
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-# Modified Script for Google Search
-# Original Submitted by https://github.com/LeventKaanOguz
+# For Searching via web browsers
 
-# Opens rofi in dmenu mod and waits for input. Then pushes the input to the query of the URL.
+# Modify this config file for default search engine
+config_file="$HOME/.config/hypr/UserConfigs/01-UserDefaults.conf"
 
+tmp_config_file=$(mktemp)
+sed 's/^\$//g; s/ = /=/g' "$config_file" > "$tmp_config_file"
+source "$tmp_config_file"
+# ##################################### #
+
+# Rofi theme and message
 rofi_theme="$HOME/.config/rofi/config-search.rasi"
-msg='‼️ **note** ‼️ search via default web browser'    
+msg='‼️ **note** ‼️ search via default web browser'
+
 # Kill Rofi if already running before execution
 if pgrep -x "rofi" >/dev/null; then
     pkill rofi
-    #exit 0
 fi
 
-# Open rofi with a dmenu and pass the selected item to xdg-open for Google search
-#echo "" | rofi -dmenu -config "$rofi_config" | xargs -I{} xdg-open "https://www.google.com/search?q={}"
+# Open Rofi and pass the selected query to xdg-open for Google search
+echo "" | rofi -dmenu -config "$rofi_theme" -mesg "$msg" | xargs -I{} xdg-open $Search_Engine
 
-echo "" | rofi -dmenu -config $rofi_theme -mesg "$msg" | xargs -I{} xdg-open "https://www.google.com/search?q={}"
+# Clean up temporary file after sourcing
+rm "$tmp_config_file"
\ No newline at end of file
diff --git a/config/hypr/v2.3.12 b/config/hypr/v2.3.13
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.3.12
+++ b/config/hypr/v2.3.13