From 0d77d8a0b2a9d883927836525b76e02503e19dcd Mon Sep 17 00:00:00 2001
From: JaKooLit <jimmielovejay@gmail.com>
Date: Sat, 15 Jun 2024 19:17:35 +0900
Subject: [PATCH] Bump to v2.3, Some hyprland settings adjustments

---
 config/hypr/UserConfigs/UserSettings.conf | 113 ++++++++++++----------
 config/hypr/{v2.2.14 => v2.3}             |   0
 copy.sh                                   |   8 +-
 3 files changed, 68 insertions(+), 53 deletions(-)
 rename config/hypr/{v2.2.14 => v2.3} (100%)

diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 8d137cc..be4f342 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -3,7 +3,7 @@
 # This is where you put your own settings as this will not be touched during update 
 # if the upgrade.sh is used.
 
-# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables
+# refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables/
 
 # Sourcing colors generated by wallust
 source = $HOME/.config/hypr/wallust/wallust-hyprland.conf
@@ -24,11 +24,12 @@ master {
 }
 
 general {
-  sensitivity=1.00
-  apply_sens_to_raw=1
+  sensitivity = 1.00
+  border_size = 2
+  apply_sens_to_raw = 1
   gaps_in = 6
   gaps_out = 8
-  border_size = 2
+
   resize_on_border = true
    
   col.active_border = $color0 $color2 $color9 $color12 $color15 90deg
@@ -37,14 +38,6 @@ general {
   layout = dwindle
 }
 
-group {
-  col.border_active = $color15
-
-	groupbar {
-	col.active = $color0
-  }
-}
-
 decoration {
   rounding = 10
          
@@ -56,21 +49,22 @@ decoration {
   dim_strength = 0.1
   dim_special = 0.8
 
-  drop_shadow=true
-  shadow_range=6
+  drop_shadow = true
+  shadow_range = 6
   shadow_render_power = 1
   col.shadow = $color12
   col.shadow_inactive = 0x50000000
 
   blur {
-  enabled = true	
-  size = 6
-  passes = 2
-  ignore_opacity = true
-  new_optimizations = true
-  special = true
+  	enabled = true	
+  	size = 6
+  	passes = 2
+  	ignore_opacity = true
+  	new_optimizations = true
+  	special = true
   }
 }
+
     
 animations {
   enabled = yes
@@ -91,37 +85,57 @@ animations {
 }
 
 input {
-  kb_layout=us
-  kb_variant=
-  kb_model=
-  kb_options=
-  kb_rules=
-  repeat_rate=50
-  repeat_delay=300
-  numlock_by_default=true
-  left_handed=false
-  follow_mouse=true
-  float_switch_override_focus=false
+  kb_layout = us
+  kb_variant =
+  kb_model =
+  kb_options =
+  kb_rules =
+  repeat_rate = 50
+  repeat_delay = 300
+  numlock_by_default = true
+  left_handed = false
+  follow_mouse = true
+  float_switch_override_focus = false
 
   touchpad {
-    disable_while_typing=true
-    natural_scroll=false 
-    clickfinger_behavior=false
-    middle_button_emulation=true
-    tap-to-click=true
-    drag_lock=false
+    disable_while_typing = true
+    natural_scroll = false 
+    clickfinger_behavior = false
+    middle_button_emulation = true
+    tap-to-click = true
+    drag_lock = false
           }
+  
+  # below for devices with touchdevice ie. touchscreen
+	touchdevice {
+		enabled = true
+	}
+	
+	# below is for table see link above for proper variables
+	tablet {
+		transform = 0
+		left_handed = 0
+	}
 }
 
 gestures {
-  workspace_swipe=true
-  workspace_swipe_fingers=3
-  workspace_swipe_distance=400
-  workspace_swipe_invert=true
-  workspace_swipe_min_speed_to_force=30
-  workspace_swipe_cancel_ratio=0.5
-  workspace_swipe_create_new=true 
-  workspace_swipe_forever=true
+  workspace_swipe = true
+  workspace_swipe_fingers = 3
+  workspace_swipe_distance = 400
+  workspace_swipe_invert = true
+  workspace_swipe_min_speed_to_force = 30
+  workspace_swipe_cancel_ratio = 0.5
+  workspace_swipe_create_new = true 
+  workspace_swipe_forever = true
+}
+
+
+group {
+  col.border_active = $color15
+
+	groupbar {
+		col.active = $color0
+  }
 }
 
 misc {
@@ -134,6 +148,7 @@ misc {
   focus_on_activate = false
   swallow_regex = ^(kitty)$
   #disable_autoreload = true
+  initial_workspace_tracking = 0
 }
 
 binds {
@@ -147,7 +162,7 @@ xwayland {
     force_zero_scaling = true
 }
 
-# cursor section for Hyprland v0.41.0 or newer
-#cursor {
-#	enable_hyprcursor = true
-#}
+# cursor section for Hyprland >= v0.41.0
+cursor {
+	enable_hyprcursor = true
+}
diff --git a/config/hypr/v2.2.14 b/config/hypr/v2.3
similarity index 100%
rename from config/hypr/v2.2.14
rename to config/hypr/v2.3
diff --git a/copy.sh b/copy.sh
index afbe8a5..af51ff6 100755
--- a/copy.sh
+++ b/copy.sh
@@ -120,8 +120,8 @@ while true; do
 
     case $confirm in
         [yY])
-            # If the detected layout is correct, update the 'kb_layout=' line in the file
-            awk -v layout="$layout" '/kb_layout/ {$0 = "  kb_layout=" layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf
+            # If the detected layout is correct, update the 'kb_layout =' line in the file
+            awk -v layout="$layout" '/kb_layout/ {$0 = "  kb_layout = " layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf
             mv temp.conf config/hypr/UserConfigs/UserSettings.conf
             
             echo "${NOTE} kb_layout $layout configured in settings.  " 2>&1 | tee -a "$LOG"
@@ -138,8 +138,8 @@ while true; do
             
             read -p "${CAT} - Please enter the correct keyboard layout: " new_layout
             
-            # Update the 'kb_layout=' line with the correct layout in the file
-            awk -v new_layout="$new_layout" '/kb_layout/ {$0 = "  kb_layout=" new_layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf
+            # Update the 'kb_layout =' line with the correct layout in the file
+            awk -v new_layout="$new_layout" '/kb_layout/ {$0 = "  kb_layout = " new_layout} 1' config/hypr/UserConfigs/UserSettings.conf > temp.conf
             mv temp.conf config/hypr/UserConfigs/UserSettings.conf
             echo "${NOTE} kb_layout $new_layout configured in settings." 2>&1 | tee -a "$LOG" 
             break ;;