Merge pull request #338 from JaKooLit/development

Development to Main including pre-release

12 files changed, 93 insertions, 49 deletions

diff --git a/config/hypr/UserConfigs/Laptops.conf b/config/hypr/UserConfigs/Laptops.conf
index 2f1f2077..1a1226a9 100644
--- a/config/hypr/UserConfigs/Laptops.conf
+++ b/config/hypr/UserConfigs/Laptops.conf
@@ -7,6 +7,9 @@ $mainMod = SUPER
 $scriptsDir = $HOME/.config/hypr/scripts
 $UserConfigs = $HOME/.config/hypr/UserConfigs
 
+# for disabling Touchpad. hyprctl devices to get device name. 
+$Touchpad_Device=asue1209:00-04f3:319f-touchpad
+
 binde = , xf86KbdBrightnessDown, exec, $scriptsDir/BrightnessKbd.sh --dec #Keyboard brightness Down
 binde = , xf86KbdBrightnessUp, exec, $scriptsDir/BrightnessKbd.sh --inc #Keyboard brightness up
 bind = , xf86Launch1, exec, rog-control-center # ASUS Armory crate button
@@ -23,6 +26,11 @@ bind = $mainMod CTRL, F6, exec, $scriptsDir/ScreenShot.sh --in5 # Screenshot in
 bind = $mainMod ALT, F6, exec, $scriptsDir/ScreenShot.sh --in10 # Screenshot in 10 secs
 bind = ALT, F6, exec, $scriptsDir/ScreenShot.sh --active # Screenshot active window
 
+$TOUCHPAD_ENABLED = true
+device {
+  name = $Touchpad_Device
+  enabled = $TOUCHPAD_ENABLED
+}
 # Below are useful when you are connecting your laptop in external display
 # Suggest you edit below for your laptop display
 # From WIKI This is to disable laptop monitor when lid is closed.
diff --git a/config/hypr/UserScripts/QuickEdit.sh b/config/hypr/UserScripts/QuickEdit.sh
index af5c65d2..da6a8931 100755
--- a/config/hypr/UserScripts/QuickEdit.sh
+++ b/config/hypr/UserScripts/QuickEdit.sh
@@ -1,6 +1,10 @@
 #!/bin/bash
 # Rofi menu for Quick Edit / View of Settings (SUPER E)
 
+# define your preferred text editor and terminal to use
+editor=nano
+tty=kitty
+
 configs="$HOME/.config/hypr/configs"
 UserConfigs="$HOME/.config/hypr/UserConfigs"
 
@@ -21,34 +25,34 @@ main() {
     choice=$(menu | rofi -i -dmenu -config ~/.config/rofi/config-compact.rasi | cut -d. -f1)
     case $choice in
         1)
-            kitty -e nano "$UserConfigs/ENVariables.conf"
+            $tty $editor "$UserConfigs/ENVariables.conf"
             ;;
         2)
-            kitty -e nano "$UserConfigs/WindowRules.conf"
+            $tty $editor "$UserConfigs/WindowRules.conf"
             ;;
         3)
-            kitty -e nano "$UserConfigs/Startup_Apps.conf"
+            $tty $editor "$UserConfigs/Startup_Apps.conf"
             ;;
         4)
-            kitty -e nano "$UserConfigs/UserKeybinds.conf"
+            $tty $editor "$UserConfigs/UserKeybinds.conf"
             ;;
         5)
-            kitty -e nano "$UserConfigs/Monitors.conf"
+            $tty $editor "$UserConfigs/Monitors.conf"
             ;;
         6)
-            kitty -e nano "$UserConfigs/Laptops.conf"
+            $tty $editor "$UserConfigs/Laptops.conf"
             ;;
         7)
-            kitty -e nano "$UserConfigs/UserSettings.conf"
+            $tty $editor "$UserConfigs/UserSettings.conf"
             ;;
         8)
-            kitty -e nano "$UserConfigs/WorkspaceRules.conf"
+            $tty $editor "$UserConfigs/WorkspaceRules.conf"
             ;;
 		9)
-            kitty -e nano "$configs/Settings.conf"
+            $tty $editor "$configs/Settings.conf"
             ;;
         10)
-            kitty -e nano "$configs/Keybinds.conf"
+            $tty $editor "$configs/Keybinds.conf"
             ;;
         *)
             ;;
diff --git a/config/hypr/UserScripts/RofiBeats.sh b/config/hypr/UserScripts/RofiBeats.sh
index ffd0e7ae..7a7ac3f5 100755
--- a/config/hypr/UserScripts/RofiBeats.sh
+++ b/config/hypr/UserScripts/RofiBeats.sh
@@ -59,12 +59,12 @@ play_local_music() {
       # For some reason wont start playlist at 0
       if [[ $i -eq 0 ]]; then
         # Play the selected local music file using mpv
-        mpv --loop-playlist --vid=no "$mDIR" 
+        mpv --loop-playlist --vid=no "$mDIR/$choice" 
       	
       else
         file=$i
         # Play the selected local music file using mpv
-        mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR"
+        mpv --playlist-start="$file" --loop-playlist --vid=no "$mDIR/$choice"
       fi
       break
     fi
diff --git a/config/hypr/configs/Keybinds.conf b/config/hypr/configs/Keybinds.conf
index dbec4d10..30486de2 100644
--- a/config/hypr/configs/Keybinds.conf
+++ b/config/hypr/configs/Keybinds.conf
@@ -12,8 +12,8 @@ $UserScripts = $HOME/.config/hypr/UserScripts
 
 bind = CTRL ALT, Delete, exec, hyprctl dispatch exit 0
 bind = $mainMod, Q, killactive,
-bind = $mainMod, F, fullscreen
-bind = $mainMod SHIFT, Q, closewindow, 
+bind = $mainMod, F, fullscreen 
+bind = $mainMod SHIFT, Q, exec, $scriptsDir/KillActiveProcess.sh
 bind = $mainMod SHIFT, F, togglefloating,
 bind = $mainMod ALT, F, exec, hyprctl dispatch workspaceopt allfloat
 bind = CTRL ALT, L, exec, $scriptsDir/LockScreen.sh
diff --git a/config/hypr/scripts/DarkLight.sh b/config/hypr/scripts/DarkLight.sh
index e6f212f6..77426902 100755
--- a/config/hypr/scripts/DarkLight.sh
+++ b/config/hypr/scripts/DarkLight.sh
@@ -14,6 +14,8 @@ SCRIPTSDIR="$HOME/.config/hypr/scripts"
 notif="$HOME/.config/swaync/images/bell.png"
 wallust_rofi="$HOME/.config/wallust/templates/colors-rofi.rasi"
 
+kitty_conf="$HOME/.config/kitty/kitty.conf"
+
 wallust_config="$HOME/.config/wallust/wallust.toml"
 pallete_dark="dark16"
 pallete_light="light16"
@@ -97,6 +99,20 @@ else
 	sed -i '/@define-color noti-bg-alt/s/#.*;/#F0F0F0;/' "${ags_style}"
 fi
 
+# kitty background color change
+if [ "$next_mode" = "Dark" ]; then
+    sed -i '/^foreground /s/^foreground .*/foreground #dddddd/' "${kitty_conf}"
+	sed -i '/^background /s/^background .*/background #000000/' "${kitty_conf}"
+	sed -i '/^cursor /s/^cursor .*/cursor #dddddd/' "${kitty_conf}"
+else
+	sed -i '/^foreground /s/^foreground .*/foreground #000000/' "${kitty_conf}"
+	sed -i '/^background /s/^background .*/background #dddddd/' "${kitty_conf}"
+	sed -i '/^cursor /s/^cursor .*/cursor #000000/' "${kitty_conf}"
+fi
+
+
+
+
 # Set Dynamic Wallpaper for Dark or Light Mode
 if [ "$next_mode" = "Dark" ]; then
     next_wallpaper="$(find "${dark_wallpapers}" -type f \( -iname "*.jpg" -o -iname "*.png" \) -print0 | shuf -n1 -z | xargs -0)"
diff --git a/config/hypr/scripts/KeyHints.sh b/config/hypr/scripts/KeyHints.sh
index 612038d2..85fb1dc6 100755
--- a/config/hypr/scripts/KeyHints.sh
+++ b/config/hypr/scripts/KeyHints.sh
@@ -45,7 +45,7 @@ yad --width=$dynamic_width --height=$dynamic_height \
 " T" "Open File Manager" "(Thunar)" \
 " S" "Google Search" "(rofi)" \
 " Q" "close active window" "(not kill)" \
-" Shift Q " "closes a specified window" "(window)" \
+" Shift Q " "kills an active window" "(kill)" \
 " Z" "Desktop Zoom" "(pyprland)" \
 " Alt V" "Clipboard Manager" "(cliphist)" \
 " W" "Choose wallpaper" "(Wallpaper Menu)" \
diff --git a/config/hypr/scripts/KillActiveProcess.sh b/config/hypr/scripts/KillActiveProcess.sh
new file mode 100755
index 00000000..bee146d7
--- /dev/null
+++ b/config/hypr/scripts/KillActiveProcess.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
+
+# Copied from Discord post. Thanks to @Zorg
+
+
+# Get id of an active window
+active_pid=$(hyprctl activewindow | grep -o 'pid: [0-9]*' | cut -d' ' -f2)
+
+# Close active window
+kill $active_pid
\ No newline at end of file
diff --git a/config/hypr/scripts/TouchPad.sh b/config/hypr/scripts/TouchPad.sh
index e94ee068..228e4ca2 100755
--- a/config/hypr/scripts/TouchPad.sh
+++ b/config/hypr/scripts/TouchPad.sh
@@ -1,27 +1,32 @@
 #!/bin/bash
 # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
 # For disabling touchpad.
-# Edit the Touchpad_Device according to your system
+# Edit the Touchpad_Device on ~/.config/hypr/UserConfigs/Laptops.conf according to your system
 # use hyprctl devices to get your system touchpad device name
+# source https://github.com/hyprwm/Hyprland/discussions/4283?sort=new#discussioncomment-8648109
 
-
-Touchpad_Device="asue1209:00-04f3:319f-touchpad"
 notif="$HOME/.config/swaync/images/bell.png"
 
-XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/run/user/$(id -u)}
-STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"
+export STATUS_FILE="$XDG_RUNTIME_DIR/touchpad.status"
 
-toggle_touchpad() {
-  if [ ! -f "$STATUS_FILE" ] || [ "$(cat "$STATUS_FILE")" = "false" ]; then
-    echo "true" > "$STATUS_FILE"
-    action="enabled"
-  else
-    echo "false" > "$STATUS_FILE"
-    action="disabled"
-  fi
+enable_touchpad() {
+    printf "true" >"$STATUS_FILE"
+    notify-send -u low -i $notif  "Enabling touchpad"
+    hyprctl keyword '$TOUCHPAD_ENABLED' "true" -r
+}
 
-  notify-send -u low -i "$notif" "Touchpad $action"
-  hyprctl keyword "device[$Touchpad_Device]:enabled" "$(cat "$STATUS_FILE")"
+disable_touchpad() {
+    printf "false" >"$STATUS_FILE"
+    notify-send -u low -i $notif "Disabling touchpad"
+    hyprctl keyword '$TOUCHPAD_ENABLED' "false" -r
 }
 
-toggle_touchpad
+if ! [ -f "$STATUS_FILE" ]; then
+  enable_touchpad
+else
+  if [ $(cat "$STATUS_FILE") = "true" ]; then
+    disable_touchpad
+  elif [ $(cat "$STATUS_FILE") = "false" ]; then
+    enable_touchpad
+  fi
+fi
diff --git a/config/hypr/v2.2.13 b/config/hypr/v2.2.14
index 31b3414d..31b3414d 100644
--- a/config/hypr/v2.2.13
+++ b/config/hypr/v2.2.14
diff --git a/config/hypr/wallpaper_effects/.wallpaper_current b/config/hypr/wallpaper_effects/.wallpaper_current
index c8681762..d46136eb 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_current
+++ b/config/hypr/wallpaper_effects/.wallpaper_current
diff --git a/config/hypr/wallpaper_effects/.wallpaper_modified b/config/hypr/wallpaper_effects/.wallpaper_modified
index a6a14cf1..771d86f9 100644
--- a/config/hypr/wallpaper_effects/.wallpaper_modified
+++ b/config/hypr/wallpaper_effects/.wallpaper_modified
diff --git a/config/hypr/wallust/wallust-hyprland.conf b/config/hypr/wallust/wallust-hyprland.conf
index 86f1869c..3ec65c1a 100644
--- a/config/hypr/wallust/wallust-hyprland.conf
+++ b/config/hypr/wallust/wallust-hyprland.conf
@@ -1,18 +1,18 @@
-$background = rgb(020302)
-$foreground = rgb(BFBEB7)
-$color0 = rgb(020302)
-$color1 = rgb(171812)
-$color2 = rgb(1F1E16)
-$color3 = rgb(26251B)
-$color4 = rgb(2E2C20)
-$color5 = rgb(363324)
-$color6 = rgb(363324)
-$color7 = rgb(9B998F)
-$color8 = rgb(6C6B64)
-$color9 = rgb(1F1F18)
-$color10 = rgb(29291E)
-$color11 = rgb(333224)
-$color12 = rgb(3E3B2A)
-$color13 = rgb(484430)
-$color14 = rgb(484430)
-$color15 = rgb(9B998F)
+$background = rgb(030508)
+$foreground = rgb(D6CBD5)
+$color0 = rgb(030508)
+$color1 = rgb(0C1523)
+$color2 = rgb(2A3859)
+$color3 = rgb(324166)
+$color4 = rgb(205F36)
+$color5 = rgb(11606B)
+$color6 = rgb(685066)
+$color7 = rgb(BCADBB)
+$color8 = rgb(847983)
+$color9 = rgb(101C2F)
+$color10 = rgb(384B76)
+$color11 = rgb(425788)
+$color12 = rgb(2B7F48)
+$color13 = rgb(16808F)
+$color14 = rgb(8A6B88)
+$color15 = rgb(BCADBB)