From d2e32dbfb485695bc78de78d51b8cb6567316d71 Mon Sep 17 00:00:00 2001
From: Adam Stück <adam@adast.xyz>
Date: Tue, 7 Feb 2023 17:32:26 +0100
Subject: Use i3config instead of sxhkd for bindings

---
 .config/X11/xinitrc   |  2 +-
 .config/i3/config     | 52 +++++++++++++++++++++++++++--
 .config/sxhkd/sxhkdrc | 92 ---------------------------------------------------
 3 files changed, 51 insertions(+), 95 deletions(-)
 delete mode 100644 .config/sxhkd/sxhkdrc

diff --git a/.config/X11/xinitrc b/.config/X11/xinitrc
index 2e3a233..90c7e25 100755
--- a/.config/X11/xinitrc
+++ b/.config/X11/xinitrc
@@ -43,5 +43,5 @@ betterlockscreen -u ~/.local/share/lock &
 ~/.local/bin/screensaver &
 ~/.local/bin/comptoggle &
 ~/.local/bin/rate &
-sxhkd &
+# sxhkd &
 exec i3
diff --git a/.config/i3/config b/.config/i3/config
index 4095f85..f88dbd4 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -2,6 +2,54 @@ set $mod Mod4
 set $alt Mod1
 floating_modifier $mod
 
+bindsym $mod+Shift+q kill
+bindsym $mod+Escape exec --no-startup-id systemctl suspend
+bindsym $mod+Return exec alacritty
+bindsym $mod+b exec firefox
+bindsym $mod+f fullscreen toggle
+bindsym $mod+i exec --no-startup-id polybar-msg cmd toggle
+bindsym $mod+Shift+s exec --no-startup-id ~/.local/bin/screenshot -s
+bindsym Print exec --no-startup-id ~/.local/bin/screenshot
+bindsym $mod+Shift+c exec --no-startup-id ~/.local/bin/comptoggle
+
+bindsym $mod+d exec --no-startup-id dmenu_run -p 'run:' -l 8 -b -i -fn 'JetBrainsMono NerdFont:size=11'
+bindsym $alt+b exec --no-startup-id clipmenu -p 'clip:' -b -i -fn 'JetBrainsMono NerdFont:size=11'
+bindsym $mod+p exec --no-startup-id ~/.local/bin/dmenu/dm-pass
+bindsym $mod+Shift+p exec --no-startup-id ~/.local/bin/dmenu/dm-power
+
+bindsym XF86AudioRaiseVolume exec --no-startup-id pamixer -i 5
+bindsym XF86AudioLowerVolume exec --no-startup-id pamixer -d 5
+bindsym XF86AudioMute exec --no-startup-id pamixer -t
+bindsym XF86AudioPlay exec --no-startup-id playerctl play-pause
+bindsym XF86AudioNext exec --no-startup-id playerctl next
+bindsym XF86AudioPrev exec --no-startup-id playerctl previous
+bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5
+bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5
+
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+bindsym $mod+Tab focus mode_toggle
+
+bindsym $mod+g split h
+bindsym $mod+v split v
+bindsym $mod+t layout toggle tabbed splith splitv
+bindsym $mod+Shift+f floating toggle
+
 bindsym $mod+1 workspace number 1
 bindsym $mod+2 workspace number 2
 bindsym $mod+3 workspace number 3
@@ -64,7 +112,7 @@ title_align center
 smart_gaps on
 hide_edge_borders smart
 popup_during_fullscreen smart
-focus_follows_mouse no
+focus_follows_mouse yes
 
 floating_maximum_size -1 x -1
 for_window [class="floating_window"] floating enable
@@ -72,4 +120,4 @@ for_window [window_role="pop-up"] floating enable
 for_window [window_role="About"] floating enable
 for_window [class="Nextcloud"] floating enable
 
-exec_always --no-startup-id $HOME/.local/bin/barlaunch
+exec_always --no-startup-id ~/.local/bin/barlaunch
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
deleted file mode 100644
index a0c84de..0000000
--- a/.config/sxhkd/sxhkdrc
+++ /dev/null
@@ -1,92 +0,0 @@
-super + shift + q
-    i3-msg kill
-
-super + shift + r
-    i3-msg restart
-
-super + shift + p
-    rofi -show p -modi "p:rofi-power-menu --choices=shutdown/reboot/suspend/logout --confirm="
-
-super + Escape
-    systemctl suspend
-
-super + Return
-    i3-msg exec alacritty
-
-super + b
-    i3-msg exec firefox
-
-super + f
-    i3-msg fullscreen toggle
-
-super + i
-    polybar-msg cmd toggle
-
-super + shift + s
-    $HOME/.local/bin/screenshot -s
-
-Print
-    $HOME/.local/bin/screenshot
-
-super + shift + c
-    $HOME/.local/bin/comptoggle 
-
-super + d 
-    rofi -show drun -show-icons -drun-display-format \{name\}
-
-alt + b 
-    clipmenu -i -p clipmenu 
-
-super + p 
-    rofi-pass
-
-XF86AudioRaiseVolume  
-    pamixer -i 5
-
-XF86AudioLowerVolume  
-    pamixer -d 5
-
-XF86AudioMute  
-    pamixer -t
-
-XF86AudioPlay  
-    playerctl play-pause
-
-XF86AudioNext  
-    playerctl next
-
-XF86AudioPrev  
-    playerctl previous
-
-XF86MonBrightnessUp  
-    xbacklight -inc 5
-
-XF86MonBrightnessDown  
-    xbacklight -dec 5
-
-super + {Left,Down,Up,Right}
-    i3-msg focus {left,down,up,right}
-
-super + {h,j,k,l}
-    i3-msg focus {left,down,up,right}
-
-super + shift + {Left,Down,Up,Right}
-    i3-msg move {left,down,up,right}
-
-super + shift + {h,j,k,l}
-    i3-msg move {left,down,up,right}
-
-super + Tab
-    i3-msg focus mode_toggle
-
-super + g
-    i3-msg split h
-
-super + v
-    i3-msg split v
-
-super + t
-    i3-msg layout toggle tabbed splith splitv
-
-super + shift + f
-    i3-msg floating toggle
-- 
cgit v1.2.3-70-g09d2