From c9ba0b7ba8c6b7b15bdc258a064eef6070d62d61 Mon Sep 17 00:00:00 2001
From: Michel Fedde <fedde@eventit.ag>
Date: Wed, 23 Apr 2025 15:37:25 +0200
Subject: [PATCH] Improved Input configuration

---
 ...nput.conf##class.PC,default => Input.conf} | 23 ++++++++++----
 .../config/settings/Input.conf##class.Laptop  | 25 ----------------
 .../hypr/config/settings/Input.conf##default  | 30 -------------------
 .gitignore                                    |  2 --
 4 files changed, 18 insertions(+), 62 deletions(-)
 rename .config/hypr/config/settings/{Input.conf##class.PC,default => Input.conf} (67%)
 delete mode 100644 .config/hypr/config/settings/Input.conf##class.Laptop
 delete mode 100644 .config/hypr/config/settings/Input.conf##default

diff --git a/.config/hypr/config/settings/Input.conf##class.PC,default b/.config/hypr/config/settings/Input.conf
similarity index 67%
rename from .config/hypr/config/settings/Input.conf##class.PC,default
rename to .config/hypr/config/settings/Input.conf
index 82269fb..0d7d22f 100644
--- a/.config/hypr/config/settings/Input.conf##class.PC,default
+++ b/.config/hypr/config/settings/Input.conf
@@ -1,12 +1,13 @@
 input {
-  kb_layout = us
+  kb_layout = de
   kb_variant =
   kb_model =
   kb_options =
   kb_rules =
   repeat_rate = 50
   repeat_delay = 300
-  accel_profile = flat
+
+  accel_profile = adaptive
 
   sensitivity = 0 #mouse sensitivity
   numlock_by_default = true
@@ -21,10 +22,22 @@ input {
     middle_button_emulation = true
     tap-to-click = true
     drag_lock = false
-  } 
+  }
 }
 
 device {
-  name = logitech-mx-ergo-1
-  accel_profile = adaptive
+  name = logitech-mx-master-3-1
+  accel_profile = flat
+}
+
+device {
+  name = keychron--keychron-link--keyboard
+  kb_layout = us
+  kb_variant = altgr-intl
+}
+
+device {
+  name = evremap-virtual-input-for-/dev/input/event17
+  kb_layout = us
+  kb_variant = altgr-intl
 }
diff --git a/.config/hypr/config/settings/Input.conf##class.Laptop b/.config/hypr/config/settings/Input.conf##class.Laptop
deleted file mode 100644
index 7e07fb8..0000000
--- a/.config/hypr/config/settings/Input.conf##class.Laptop
+++ /dev/null
@@ -1,25 +0,0 @@
-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 = 0
-  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##default b/.config/hypr/config/settings/Input.conf##default
deleted file mode 100644
index 82269fb..0000000
--- a/.config/hypr/config/settings/Input.conf##default
+++ /dev/null
@@ -1,30 +0,0 @@
-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 = 0
-  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/.gitignore b/.gitignore
index 6983bb8..041cb10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,11 +58,9 @@
 # Scripts automatically add entries here
 .config/hypr/config/Monitors.conf
 .config/hypr/config/WorkspaceRules.conf
-.config/hypr/config/settings/Input.conf
 .config/waybar/Output.config.json
 .config/evremap/evremap.toml
 .config/hypr/config/Autostart.conf
-.config/yadm/bootstrap.d/02-AMDGPUDrivers.sh
 .config/evremap/keychron.toml
 .config/evremap/ATKeyboard.toml
 .config/evremap/SurfaceKeyboard.toml