From f04b78f3d51df2e59bd35c503d5a703075da4d4a Mon Sep 17 00:00:00 2001 From: Michel Fedde Date: Wed, 12 Feb 2025 19:32:01 +0100 Subject: [PATCH] Moves settings to own folder --- .config/hypr/config/Settings.conf | 135 ++---------------- .config/hypr/config/settings/Binds.conf | 6 + .config/hypr/config/settings/Cursor.conf | 8 ++ .config/hypr/config/settings/Dwindle.conf | 5 + .config/hypr/config/settings/General.conf | 5 + .config/hypr/config/settings/Gestures.conf | 11 ++ .../config/settings/Input.conf##class.Laptop | 25 ++++ .../hypr/config/settings/Input.conf##class.PC | 30 ++++ .config/hypr/config/settings/Master.conf | 5 + .config/hypr/config/settings/Misc.conf | 13 ++ .config/hypr/config/settings/Render.conf | 6 + .config/hypr/config/settings/Xwayland.conf | 6 + .../xfconf/xfce-perchannel-xml/thunar.xml | 8 +- .gitignore | 3 +- 14 files changed, 138 insertions(+), 128 deletions(-) create mode 100644 .config/hypr/config/settings/Binds.conf create mode 100644 .config/hypr/config/settings/Cursor.conf create mode 100644 .config/hypr/config/settings/Dwindle.conf create mode 100644 .config/hypr/config/settings/General.conf create mode 100644 .config/hypr/config/settings/Gestures.conf create mode 100644 .config/hypr/config/settings/Input.conf##class.Laptop create mode 100644 .config/hypr/config/settings/Input.conf##class.PC create mode 100644 .config/hypr/config/settings/Master.conf create mode 100644 .config/hypr/config/settings/Misc.conf create mode 100644 .config/hypr/config/settings/Render.conf create mode 100644 .config/hypr/config/settings/Xwayland.conf diff --git a/.config/hypr/config/Settings.conf b/.config/hypr/config/Settings.conf index bd99e08..5c89d4f 100644 --- a/.config/hypr/config/Settings.conf +++ b/.config/hypr/config/Settings.conf @@ -1,125 +1,12 @@ -# /* ---- 💫 https://github.com/JaKooLit 💫 ---- */ # -# User Settings -# This is where you put your own settings as this will not be touched during update -# if the upgrade.sh is used. +$settingsPath = ~/.config/hypr/config/settings -# 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 = yes - preserve_split = yes - 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 - accel_profile = flat - - sensitivity = 0 #mouse sensitivity - 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 - } - - # 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 - } - -} - -device { - name = logitech-mx-ergo-1 - accel_profile = adaptive -} -gestures { - 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 -} - - -misc { - disable_hyprland_logo = true - disable_splash_rendering = true - vfr = true - vrr = 2 - mouse_move_enables_dpms = true - enable_swallow = true - swallow_regex = ^(kitty)$ - focus_on_activate = false - initial_workspace_tracking = 0 - middle_click_paste = false -} - -#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 section for Hyprland >= v0.42.0 -render { - explicit_sync = 2 - explicit_sync_kms = 2 - direct_scanout = false -} - -cursor { - sync_gsettings_theme = true - no_hardware_cursors = 2 - enable_hyprcursor = true - warp_on_change_workspace = 2 - no_warps = true -} +source = $settingsPath/Dwindle.conf +source = $settingsPath/Master.conf +source = $settingsPath/General.conf +source = $settingsPath/Input.conf +source = $settingsPath/Gestures.conf +source = $settingsPath/Misc.conf +source = $settingsPath/Binds.conf +source = $settingsPath/Xwayland.conf +source = $settingsPath/Render.conf +source = $settingsPath/Cursor.conf diff --git a/.config/hypr/config/settings/Binds.conf b/.config/hypr/config/settings/Binds.conf new file mode 100644 index 0000000..dc86154 --- /dev/null +++ b/.config/hypr/config/settings/Binds.conf @@ -0,0 +1,6 @@ + +binds { + workspace_back_and_forth = true + allow_workspace_cycles = true + pass_mouse_when_bound = false +} diff --git a/.config/hypr/config/settings/Cursor.conf b/.config/hypr/config/settings/Cursor.conf new file mode 100644 index 0000000..2f5d128 --- /dev/null +++ b/.config/hypr/config/settings/Cursor.conf @@ -0,0 +1,8 @@ + +cursor { + sync_gsettings_theme = true + no_hardware_cursors = 2 + enable_hyprcursor = true + warp_on_change_workspace = 2 + no_warps = true +} diff --git a/.config/hypr/config/settings/Dwindle.conf b/.config/hypr/config/settings/Dwindle.conf new file mode 100644 index 0000000..9800d75 --- /dev/null +++ b/.config/hypr/config/settings/Dwindle.conf @@ -0,0 +1,5 @@ +dwindle { + pseudotile = yes + preserve_split = yes + special_scale_factor = 0.8 +} diff --git a/.config/hypr/config/settings/General.conf b/.config/hypr/config/settings/General.conf new file mode 100644 index 0000000..c14ff18 --- /dev/null +++ b/.config/hypr/config/settings/General.conf @@ -0,0 +1,5 @@ +general { + resize_on_border = true + + layout = dwindle +} diff --git a/.config/hypr/config/settings/Gestures.conf b/.config/hypr/config/settings/Gestures.conf new file mode 100644 index 0000000..86c4866 --- /dev/null +++ b/.config/hypr/config/settings/Gestures.conf @@ -0,0 +1,11 @@ +gestures { + 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 +} diff --git a/.config/hypr/config/settings/Input.conf##class.Laptop b/.config/hypr/config/settings/Input.conf##class.Laptop new file mode 100644 index 0000000..f95eaf6 --- /dev/null +++ b/.config/hypr/config/settings/Input.conf##class.Laptop @@ -0,0 +1,25 @@ +input { + kb_layout = de + kb_variant = + kb_model = + kb_options = + kb_rules = + repeat_rate = 50 + repeat_delay = 300 + accel_profile = adaptive + + sensitivity = 0 #mouse sensitivity + 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 + } +} diff --git a/.config/hypr/config/settings/Input.conf##class.PC b/.config/hypr/config/settings/Input.conf##class.PC new file mode 100644 index 0000000..3573096 --- /dev/null +++ b/.config/hypr/config/settings/Input.conf##class.PC @@ -0,0 +1,30 @@ +input { + kb_layout = us + kb_variant = + kb_model = + kb_options = + kb_rules = + repeat_rate = 50 + repeat_delay = 300 + accel_profile = flat + + sensitivity = 0 #mouse sensitivity + 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 + } +} + +device { + name = logitech-mx-ergo-1 + accel_profile = adaptive +} diff --git a/.config/hypr/config/settings/Master.conf b/.config/hypr/config/settings/Master.conf new file mode 100644 index 0000000..39a20c5 --- /dev/null +++ b/.config/hypr/config/settings/Master.conf @@ -0,0 +1,5 @@ +master { + new_status = master + new_on_top = 1 + mfact = 0.5 +} diff --git a/.config/hypr/config/settings/Misc.conf b/.config/hypr/config/settings/Misc.conf new file mode 100644 index 0000000..19a2e52 --- /dev/null +++ b/.config/hypr/config/settings/Misc.conf @@ -0,0 +1,13 @@ +misc { + disable_hyprland_logo = true + disable_splash_rendering = true + vfr = true + vrr = 2 + mouse_move_enables_dpms = true + enable_swallow = true + swallow_regex = ^(kitty)$ + focus_on_activate = false + initial_workspace_tracking = 0 + middle_click_paste = false +} + diff --git a/.config/hypr/config/settings/Render.conf b/.config/hypr/config/settings/Render.conf new file mode 100644 index 0000000..f2d60e7 --- /dev/null +++ b/.config/hypr/config/settings/Render.conf @@ -0,0 +1,6 @@ + +render { + explicit_sync = 2 + explicit_sync_kms = 2 + direct_scanout = false +} diff --git a/.config/hypr/config/settings/Xwayland.conf b/.config/hypr/config/settings/Xwayland.conf new file mode 100644 index 0000000..48d4886 --- /dev/null +++ b/.config/hypr/config/settings/Xwayland.conf @@ -0,0 +1,6 @@ + +xwayland { + enabled = true + force_zero_scaling = true +} + diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml index 1cb40fc..ba2bf6f 100644 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml +++ b/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml @@ -1,7 +1,7 @@ - + @@ -11,9 +11,11 @@ - + - + + + diff --git a/.gitignore b/.gitignore index 3f2bdf6..d4dd328 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ # Symlinks -.config\hypr\config\Monitors.conf +~\.config\hypr\config\Monitors.conf .config\hypr\config\WorkspaceRules.conf +.config\hypr\config\settings\Input.conf