rebase dev with br-userconfigs

3 files changed, 122 insertions, 115 deletions

diff --git a/config/hypr/UserConfigs/UserSettings.conf b/config/hypr/UserConfigs/UserSettings.conf
index 4802e79a..d08d656a 100644
--- a/config/hypr/UserConfigs/UserSettings.conf
+++ b/config/hypr/UserConfigs/UserSettings.conf
@@ -4,119 +4,4 @@
 # if the upgrade.sh is used.
 
 # refer to Hyprland wiki for more info https://wiki.hyprland.org/Configuring/Variables/
-
 # NOTE: some settings are in ~/.config/hypr/UserConfigs/UserDecorAnimations.conf
-
-dwindle {
-  pseudotile = true
-  preserve_split = true
-  #smart_split = true
-  special_scale_factor = 0.8
-}
-
-master {
-  new_status = master
-  new_on_top = 1
-  mfact = 0.5
-}
-
-general {
-  resize_on_border = true
-     
-  layout = dwindle
-}
-
-input {
-  kb_layout = us
-  kb_variant =
-  kb_model =
-  kb_options =
-  kb_rules =
-  repeat_rate = 50
-  repeat_delay = 300
-  
-  sensitivity = 0 #mouse sensitivity
-  #accel_profile =     # flat or adaptive or blank or EMPTY means libinput’s default mode
-  numlock_by_default = true
-  left_handed = false
-  follow_mouse = 1
-  float_switch_override_focus = false
-
-  touchpad {
-    disable_while_typing = true
-    natural_scroll = true 
-    clickfinger_behavior = false
-    middle_button_emulation = false
-    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 {
-  gesture = 3, horizontal, workspace
-  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
-  gesture = 3, up, dispatcher, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.5}')"
-  gesture = 3, down, dispatcher, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.5}')" 
-}
-
-misc {
-  disable_hyprland_logo = true
-  disable_splash_rendering = true
-  vfr = true
-  vrr = 2
-  mouse_move_enables_dpms = true
-  enable_swallow = off
-  swallow_regex = ^(kitty)$
-  focus_on_activate = false
-  initial_workspace_tracking = 0
-  middle_click_paste = false
-  enable_anr_dialog = true    # Application not Responding (ANR)
-  anr_missed_pings = 15       # ANR Threshold default 1 is too low
-  allow_session_lock_restore = true  # Prevent lockscreen crash when resume from suspend
-}
-
-#opengl {
-#  nvidia_anti_flicker = true
-#}
-
-binds {
-  workspace_back_and_forth = true
-  allow_workspace_cycles = true
-  pass_mouse_when_bound = false
-}
-
-#Could help when scaling and not pixelating
-xwayland {
-  enabled = true
-  force_zero_scaling = true
-}
-
-render {
-  direct_scanout = 0
-}
-
-cursor {
-  sync_gsettings_theme = true
-  no_hardware_cursors = 2 # change to 1 if want to disable
-  enable_hyprcursor = true
-  warp_on_change_workspace = 2
-  no_warps = true 
-}
diff --git a/config/hypr/configs/SystemSettings.conf b/config/hypr/configs/SystemSettings.conf
new file mode 100644
index 00000000..0c822678
--- /dev/null
+++ b/config/hypr/configs/SystemSettings.conf
@@ -0,0 +1,120 @@
+# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  #
+# Default settings
+# 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/
+# NOTE: some settings are in ~/.config/hypr/UserConfigs/UserDecorAnimations.conf
+
+dwindle {
+  pseudotile = true
+  preserve_split = true
+  #smart_split = true
+  special_scale_factor = 0.8
+}
+
+master {
+  new_status = master
+  new_on_top = 1
+  mfact = 0.5
+}
+
+general {
+  resize_on_border = true
+  layout = dwindle
+}
+
+input {
+  kb_layout = us
+  kb_variant =
+  kb_model =
+  kb_options =
+  kb_rules =
+  repeat_rate = 50
+  repeat_delay = 300
+  
+  sensitivity = 0 #mouse sensitivity
+  #accel_profile =     # flat or adaptive or blank or EMPTY means libinput’s default mode
+  numlock_by_default = true
+  left_handed = false
+  follow_mouse = 1
+  float_switch_override_focus = false
+
+  touchpad {
+    disable_while_typing = true
+    natural_scroll = true 
+    clickfinger_behavior = false
+    middle_button_emulation = false
+    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 {
+  gesture = 3, horizontal, workspace
+  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
+  gesture = 3, up, dispatcher, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.5}')"
+  gesture = 3, down, dispatcher, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.5}')" 
+}
+
+misc {
+  disable_hyprland_logo = true
+  disable_splash_rendering = true
+  vfr = true
+  vrr = 2
+  mouse_move_enables_dpms = true
+  enable_swallow = off
+  swallow_regex = ^(kitty)$
+  focus_on_activate = false
+  initial_workspace_tracking = 0
+  middle_click_paste = false
+  enable_anr_dialog = true    # Application not Responding (ANR)
+  anr_missed_pings = 15       # ANR Threshold default 1 is too low
+  allow_session_lock_restore = true  # Prevent lockscreen crash when resume from suspend
+}
+
+#opengl {
+#  nvidia_anti_flicker = true
+#}
+
+binds {
+  workspace_back_and_forth = true
+  allow_workspace_cycles = true
+  pass_mouse_when_bound = false
+}
+
+#Could help when scaling and not pixelating
+xwayland {
+  enabled = true
+  force_zero_scaling = true
+}
+
+render {
+  direct_scanout = 0
+}
+
+cursor {
+  sync_gsettings_theme = true
+  no_hardware_cursors = 2 # change to 1 if want to disable
+  enable_hyprcursor = true
+  warp_on_change_workspace = 2
+  no_warps = true 
+}
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
index 0b2c6969..8f07885a 100644
--- a/config/hypr/hyprland.conf
+++ b/config/hypr/hyprland.conf
@@ -28,6 +28,8 @@ source= $UserConfigs/LaptopDisplay.conf
 source= $configs/WindowRules.conf # Window Rules and Layer Rules (defaults)
 source= $UserConfigs/WindowRules.conf # Window Rules and Layer Rules (user)
 
+source= $configs/SystemSettings.conf # Default config for hypr 
+
 source= $UserConfigs/UserDecorations.conf # Decorations config file
 source= $UserConfigs/UserAnimations.conf # Animation config file
 source= $UserConfigs/UserKeybinds.conf # Put your own keybinds here