From 0ac879405ef1074e64b96e42d328d91dd276f107 Mon Sep 17 00:00:00 2001
From: Alex Kelly <alex.kelly@franklin.edu>
Date: Mon, 27 Jun 2022 16:37:27 -0400
Subject: [PATCH] update keybdinds in modes

---
 conf.d/key_bindings.conf | 25 +++++++++++++++++--------
 conf.d/mode_audio.conf   |  1 +
 conf.d/mode_resize.conf  |  1 +
 conf.d/mode_restore.conf |  1 +
 conf.d/mode_save.conf    |  1 +
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/conf.d/key_bindings.conf b/conf.d/key_bindings.conf
index a85c198..0b55ec8 100644
--- a/conf.d/key_bindings.conf
+++ b/conf.d/key_bindings.conf
@@ -1,29 +1,35 @@
 # Keybindings
 # Note, this is for more of a "global" keybindings.  Modes will have their own mode_whatever.conf keybinding
-# Also, I haven't moved everything out of config yet either
-bindsym $mod+m mode "audio"
-bindsym $mod+s mode "save"
-bindsym $mod+n mode "restore"
 bindsym $mod+o exec --no-startup-id rofi -show rofi-sound -modi "rofi-sound:~/.local/bin/rofi-sound-output-chooser"
+
+bindsym $mod+Return exec kitty
+
 bindsym Control+$alt+l exec xsecurelock
+
+bindsym $mod+Shift+d exec i3-dmenu-desktop --dmenu="dmenu -i -fn 'Noto Sans:size=8'"
+bindsym $mod+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8'
+
 bindsym --release button2 kill
+
 bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ +10% && $refresh_i3status
 bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume @DEFAULT_SINK@ -10% && $refresh_i3status
 bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute @DEFAULT_SINK@ toggle && $refresh_i3status
 bindsym XF86AudioMicMute exec --no-startup-id pactl set-source-mute @DEFAULT_SOURCE@ toggle && $refresh_i3status
-bindsym $mod+Shift+d exec i3-dmenu-desktop --dmenu="dmenu -i -fn 'Noto Sans:size=8'"
-bindsym $mod+d exec rofi -lines 12 -padding 18 -width 60 -location 0 -show drun -sidebar-mode -columns 3 -font 'Noto Sans 8'
+
 bindsym Control+$alt+h exec rofi -modi "clipboard:greenclip print" -show clipboard -run-command '{cmd}'
-bindsym $mod+Return exec kitty
+
 bindsym $mod+q kill
+
 bindsym $mod+b bar mode hide
 bindsym $mod+Shift+b bar mode dock
+
 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+Right focus right
+
 bindsym $mod+Shift+h move left
 bindsym $mod+Shift+j move down
 bindsym $mod+Shift+k move up
@@ -32,6 +38,7 @@ 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+v split v
 bindsym $mod+f fullscreen toggle
 bindsym $mod+w layout tabbed
@@ -39,9 +46,11 @@ bindsym $mod+e layout toggle split
 bindsym $mod+Shift+space floating toggle
 bindsym $mod+space focus mode_toggle
 bindsym $mod+a focus parent
+
 bindsym $mod+Up exec "~/bin/volume.sh up"
 bindsym $mod+Down exec "~/bin/volume.sh down"
 bindsym $mod+backslash exec "~/bin/volume.sh mtoggle"
+
 bindsym $mod+1 workspace number $ws1
 bindsym $mod+2 workspace number $ws2
 bindsym $mod+3 workspace number $ws3
@@ -52,6 +61,7 @@ bindsym $mod+7 workspace number $ws7
 bindsym $mod+8 workspace number $ws8
 bindsym $mod+9 workspace number $ws9
 bindsym $mod+0 workspace number $ws10
+
 bindsym $mod+Shift+1 move container to workspace number $ws1
 bindsym $mod+Shift+2 move container to workspace number $ws2
 bindsym $mod+Shift+3 move container to workspace number $ws3
@@ -65,4 +75,3 @@ bindsym $mod+Shift+0 move container to workspace number $ws10
 bindsym $mod+Shift+c reload
 bindsym $mod+Shift+r restart
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
-bindsym $mod+r mode "resize"
diff --git a/conf.d/mode_audio.conf b/conf.d/mode_audio.conf
index c406a1d..fc92968 100644
--- a/conf.d/mode_audio.conf
+++ b/conf.d/mode_audio.conf
@@ -1,3 +1,4 @@
+bindsym $mod+m mode "audio"
 mode "audio" {
     bindsym m exec "~/bin/volume.sh mute"
     bindsym j exec "~/bin/volume.sh down"
diff --git a/conf.d/mode_resize.conf b/conf.d/mode_resize.conf
index 9387c2f..52d2551 100644
--- a/conf.d/mode_resize.conf
+++ b/conf.d/mode_resize.conf
@@ -1,3 +1,4 @@
+bindsym $mod+r mode "resize"
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
 
diff --git a/conf.d/mode_restore.conf b/conf.d/mode_restore.conf
index 9ae3907..6763072 100644
--- a/conf.d/mode_restore.conf
+++ b/conf.d/mode_restore.conf
@@ -1,4 +1,5 @@
 # Restore workspace mode.
+bindsym $mod+n mode "restore"
 mode "restore" {
   bindsym 1 exec "i3-msg 'workspace $ws1; append_layout ~/.config/i3/layout/w1.json'"
   bindsym 2 exec "i3-msg 'workspace $ws2; append_layout ~/.config/i3/layout/w2.json'"
diff --git a/conf.d/mode_save.conf b/conf.d/mode_save.conf
index be6a362..c29d065 100644
--- a/conf.d/mode_save.conf
+++ b/conf.d/mode_save.conf
@@ -1,4 +1,5 @@
 # Save workspace mode.
+bindsym $mod+s mode "save"
 mode "save" {
   bindsym 1 exec "i3-save-tree --workspace=1 > $HOME/.config/i3/layout/w1.json"
   bindsym 2 exec "i3-save-tree --workspace=2 > $HOME/.config/i3/layout/w2.json"