From 9ca554afdd16204329f2d650e4381afdf84387b1 Mon Sep 17 00:00:00 2001
From: histalek <histalek@posteo.de>
Date: Sun, 2 Jan 2022 16:40:03 +0100
Subject: [PATCH] sway: Update definitions

---
 .config/sway/conf.d/1-set    | 14 ++++++++++----
 .config/sway/conf.d/input    |  4 ++--
 .config/sway/conf.d/keybinds | 11 +++++++----
 3 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.config/sway/conf.d/1-set b/.config/sway/conf.d/1-set
index fea1088..609818c 100644
--- a/.config/sway/conf.d/1-set
+++ b/.config/sway/conf.d/1-set
@@ -5,6 +5,8 @@
 
 ## Set super-key as mod key
 set $mod Mod4
+set $alt Mod1
+set $altgr Mod5
 
 set $left h
 set $down j
@@ -18,6 +20,10 @@ set $disp1 DP-1
 set $disp2 HDMI-A-1
 set $disp3 DP-2
 
+## Define inputs
+set $keyboard1 1547:8979:Skydigital_nkey_Mechanic_LED_Keyboard
+set $mouse1 1133:49242:Logitech_USB_Optical_Mouse
+
 ## Define Workspaces
 ## nerdfonts cheat sheet: https://www.nerdfonts.com/cheat-sheet
 set $ws1    1:  
@@ -31,13 +37,13 @@ set $ws8    8:8
 set $ws9    9:9
 set $ws0    10:10
 set $wsF1   11: 
-set $wsF2   12:12
-set $wsF3   13:13
+set $wsF2   12: 
+set $wsF3   13: 
 set $wsF4   14:14
 set $wsF5   15:  
-set $wsF6   16:  
+set $wsF6   16: 
 set $wsF7   17: 
-set $wsF8   18:18
+set $wsF8   18: 
 set $wsF9   19: 
 set $wsF10  20:20
 set $wsF11  21:  
diff --git a/.config/sway/conf.d/input b/.config/sway/conf.d/input
index caeeafd..8078d75 100644
--- a/.config/sway/conf.d/input
+++ b/.config/sway/conf.d/input
@@ -3,14 +3,14 @@
 # Input configuration #
 # =================== #
 
-input "type:keyboard" {
+input $keyboard1 {
     xkb_layout de
     xkb_variant ,nodeadkeys
     xkb_options caps:escape
     xkb_numlock enable
 }
 
-input "type:pointer" {
+input $mouse1 {
     accel_profile flat
     dwt disabled
     scroll_factor 0.5
diff --git a/.config/sway/conf.d/keybinds b/.config/sway/conf.d/keybinds
index 88cd13a..5597da4 100644
--- a/.config/sway/conf.d/keybinds
+++ b/.config/sway/conf.d/keybinds
@@ -23,17 +23,20 @@
     bindsym $mod+Shift+c reload
 
     # Lock the screen
-    bindsym Mod5+l exec swaylock -c 000000
-    #bindsym Mod5+l exec ~/.local/bin/scripts/lock_script
+    bindsym $altgr+l exec swaylock -c 000000
+    #bindsym $altgr+l exec ~/.local/bin/scripts/lock_script
 
     # Start wlogout
-    bindsym Mod5+Shift+l exec wlogout
+    #bindsym $altgr+Shift+l exec wlogout
+    bindsym $altgr+Shift+l exec wlogout
 
     # Select area for screenshot and copy to clipboard
     bindsym $mod+Shift+s exec IMG=~/Pictures/$(date +%Y-%m-%d_%H-%m-%s).png && grim -g "$(slurp)" $IMG && wl-copy < $IMG
 
     # Exit sway (logs you out of your Wayland session)
-    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+    #bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+    bindsym $mod+Shift+e exec wlogout
+
 #
 # Moving around:
 #