summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--.config/sway/config16
-rw-r--r--.config/sway/hibiki27
-rw-r--r--.config/sway/input.conf59
3 files changed, 38 insertions, 64 deletions
diff --git a/.config/sway/config b/.config/sway/config
index 97424b1..2d09d97 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -31,20 +31,6 @@ set $wsGame g
 # gaps inner 5
 show_marks yes
 
-# default keyboard
-input * {
-    xkb_layout us
-    xkb_variant mac
-    xkb_options 'caps:hyper,lvl3:ralt_switch_multikey'
-    repeat_rate 70
-}
-
-# default pointer
-input * {
-    accel_profile adaptive
-}
-
-# TODO
 include input.conf
 include binds.conf
 include auto.conf
@@ -67,5 +53,5 @@ client.unfocused $bg2 $bg $text2 $indicator2 $bg
 client.urgent $urgent2 $urgent $text $indicator $urgent
 # }}}
 
-include config.d/*
+# include config.d/*
 include "`uname -n`"
diff --git a/.config/sway/hibiki b/.config/sway/hibiki
index bd99c54..2918006 100644
--- a/.config/sway/hibiki
+++ b/.config/sway/hibiki
@@ -2,7 +2,6 @@
 
 set $laptop eDP-1
 set $desk "Dell Inc. DELL U2518D 3C4YP87AAK3L"
-set $side "Samsung Electric Company SyncMaster H9XQ502424"
 
 output * scale 1
 output * bg $HOME/.background fill
@@ -11,26 +10,8 @@ font pango:Iosevka Sparkle 12
 
 output * max_render_time 1
 # for_window [app_id=Alacritty] max_render_time 2
-for_window [app_id=firefox] max_render_time 3
-
-input "1:1:AT_Translated_Set_2_keyboard" {
-    xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,grp:alt_space_toggle,eurosign:5'
-}
-set $trackpad "2:7:SynPS/2_Synaptics_TouchPad"
-input $trackpad {
-    natural_scroll enabled
-    dwt enabled
-    tap enabled
-    click_method clickfinger
-    scroll_method two_finger
-    # pointer_accel 1
-}
-input "2:10:TPPS/2_Elan_TrackPoint" {
-    dwt enabled
-    natural_scroll enabled
-}
-
-seat * hide_cursor 2000
+# for_window [app_id=firefox] max_render_time 3
+# seat * hide_cursor 2000
 
 bar {
 	swaybar_command waybar
@@ -47,5 +28,5 @@ exec swayidle -w \
 	before-sleep 'lock' \
 	lock lock
 
-bindswitch --locked lid:on output $laptop disable
-bindswitch --locked lid:off output $laptop enable
+#bindswitch --locked lid:on output $laptop disable
+#bindswitch --locked lid:off output $laptop enable
diff --git a/.config/sway/input.conf b/.config/sway/input.conf
index 5e42c3b..ebc5cf6 100644
--- a/.config/sway/input.conf
+++ b/.config/sway/input.conf
@@ -1,35 +1,42 @@
 # vim: ft=i3
 
-# input club kbd
-input "65261:25700:Input_Club_Infinity_keyboard/QMK" {
-    # intentionally left blank
+input 1:1:AT_Translated_Set_2_keyboard {
+    xkb_layout us
+    xkb_variant mac
+    xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
+    repeat_rate 70
 }
-
-# planck ez
-input "65261:24672:OLKB_Planck" {
-    xkb_options 'eurosign:5,lvl3:ralt_switch_multikey'
+input 65261:25700:Input_Club_Infinity_keyboard/QMK {
+    xkb_layout us
+    xkb_variant mac
+    xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
+    repeat_rate 70
+}
+input 65261:24672:OLKB_Planck {
+    xkb_layout us
+    xkb_variant mac
+    xkb_options 'caps:hyper,lvl3:ralt_switch_multikey,eurosign:5'
+    repeat_rate 70
 }
 
-# trackball
-input "1149:8264:Primax_Kensington_Eagle_Trackball" {
-    # intentionally left blank
+input 2:7:SynPS/2_Synaptics_TouchPad {
+    natural_scroll enabled
+    accel_profile adaptive
+}
+input 2:10:TPPS/2_Elan_TrackPoint {
+    natural_scroll enabled
+    accel_profile adaptive
+    pointer_accel 1
+}
+input 1149:8264:Primax_Kensington_Eagle_Trackball {
+    accel_profile adaptive
 }
 
-# pen + tablet
-set $pen "10429:148:XP-PEN_STAR_G640"
+set $pen 10429:148:XP-PEN_STAR_G640_Pen
 input $pen {
-    drag disabled
-    drag_lock disabled
-    tap enabled
-    accel_profile flat
-
-    # middle_emulation disabled
-    # 331 lower pen button
-    # 332 upper pen button
-    # scroll_method on_button_down
-    # scroll_button 274
-    # map_to_output DP-6
-    map_from_region 0.0x0.0 0.3x0.3
+   accel_profile flat
 }
-#input "10429:148:XP-PEN_STAR_G640_Mouse" events disabled
-#input "10429:148:XP-PEN_STAR_G640_Keyboard" events disabled
+# seat pen attach $pen
+# seat pen hide_cursor 10000
+# seat pen idle_inhibit tablet_tool
+# seat pen idle_wake tablet_tool