Merge pull request #354 from JaKooLit/main

main to AGS-dev

2 files changed, 84 insertions, 62 deletions

diff --git a/config/hypr/UserConfigs/ENVariables.conf b/config/hypr/UserConfigs/ENVariables.conf
index ea4af035..679a94e0 100644
--- a/config/hypr/UserConfigs/ENVariables.conf
+++ b/config/hypr/UserConfigs/ENVariables.conf
@@ -27,22 +27,24 @@ env = MOZ_ENABLE_WAYLAND,1
 env = ELECTRON_OZONE_PLATFORM_HINT,auto
 
 # NVIDIA 
-# This is from Hyprland Wiki. As a start, WLR_NO_HARDWARE_CURSORS 1 will be activated if nvidia gpu detected
+# This is from Hyprland Wiki. Below will be activated nvidia gpu detected
 #env = LIBVA_DRIVER_NAME,nvidia 
 #env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+#env = NVD_BACKEND,direct 
+
+# additional ENV's for nvidia. Caution, activate with care
 #env = GBM_BACKEND,nvidia-drm 
 
 #env = __NV_PRIME_RENDER_OFFLOAD,1 
 #env = __VK_LAYER_NV_optimus,NVIDIA_only
 #env = WLR_DRM_NO_ATOMIC,1
-#env = NVD_BACKEND,direct
+
 
 # FOR VM and POSSIBLY NVIDIA
-#env = WLR_NO_HARDWARE_CURSORS,1
+#env = WLR_NO_HARDWARE_CURSORS,1 # On hyprland >v0.41, now configured on variable cursor section
 #env = WLR_RENDERER_ALLOW_SOFTWARE,1
 
 # nvidia firefox (for hardware acceleration on FF)?
 # check this post https://github.com/elFarto/nvidia-vaapi-driver#configuration
 #env = MOZ_DISABLE_RDD_SANDBOX,1
-#env = NVD_BACKEND,direct
 #env = EGL_PLATFORM,wayland
\ No newline at end of file
diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 8d137cc8..fe5e92f0 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
@@ -18,17 +18,19 @@ dwindle {
 }
 
 master {
-  new_is_master=1
+  #new_is_master=1 # comment this when Hyprland release a new version or you are running the git version
+  new_status=master # hyprland upstream or git version (next release maybe v0.41-2 or v0.42)
   new_on_top=1
   mfact = 0.5
 }
 
 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 +39,6 @@ general {
   layout = dwindle
 }
 
-group {
-  col.border_active = $color15
-
-	groupbar {
-	col.active = $color0
-  }
-}
-
 decoration {
   rounding = 10
          
@@ -56,21 +50,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,63 +86,88 @@ 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 = 500
+  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_use_r = true #uncomment if wanted a forever create a new workspace with swipe right
+}
+
+
+group {
+  col.border_active = $color15
+
+	groupbar {
+		col.active = $color0
+  }
 }
 
 misc {
   disable_hyprland_logo = true
   disable_splash_rendering = true
-  mouse_move_enables_dpms = true
+	vfr = true
   #vrr = 0
+  mouse_move_enables_dpms = true
   enable_swallow = true
-  no_direct_scanout = true #for fullscreen games
-  focus_on_activate = false
   swallow_regex = ^(kitty)$
-  #disable_autoreload = true
+  focus_on_activate = false
+  no_direct_scanout = true #for fullscreen games
+  initial_workspace_tracking = 0
+  middle_click_paste = false
 }
 
 binds {
-  workspace_back_and_forth=true
-  allow_workspace_cycles=true
-  pass_mouse_when_bound=false
+  workspace_back_and_forth = true
+  allow_workspace_cycles = true
+  pass_mouse_when_bound = false
 }
 
 #Could help when scaling and not pixelating
 xwayland {
-    force_zero_scaling = true
+  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 {
+  no_hardware_cursors = false
+  enable_hyprcursor = true
+  warp_on_change_workspace = true # for -git or Hyprland >v0.41.1
+}