From ccef13a1e4cd8a9b8eaa5dee8873eb36f8aaea1f Mon Sep 17 00:00:00 2001
From: Shaun Reed <shaunrd0@gmail.com>
Date: Sat, 5 Oct 2019 09:55:31 -0400
Subject: [PATCH] Keybinds for Geary / Discord

---
 conky/.config/conky/shortcuts_green | 13 +++++++-----
 i3/.config/i3/config                | 32 +++++++++++++++++++----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/conky/.config/conky/shortcuts_green b/conky/.config/conky/shortcuts_green
index a88b641..8ee3367 100644
--- a/conky/.config/conky/shortcuts_green
+++ b/conky/.config/conky/shortcuts_green
@@ -21,11 +21,13 @@ conky.text = [[
 
 ---------------Applications---------------
 ${color2}open new terminal - ${color}mod+Enter
-${color2}open dropdown terminal - ${color}mod+a
+${color2}open dropdown tilix terminal - ${color}mod+a
 ${color2}Firefox - ${color}mod+F2
-${color2}Signal - ${color}mod+F3
-${color2}Bitwarden - ${color}mod+F4
-${color2}PCManfm filemanager - ${color}mod+Shift+F3
+${color2}Geary - ${color}mod+F3
+${color2}Discord - ${color}mod+F4
+${color2}Signal - ${color}mod+F5
+${color2}Bitwarden - ${color}mod+F6
+${color2}PCManfm filemanager - ${color}mod+F8
 
 ---------------Screenshots----------------
 ${color2}image clip tool - ${color}mod+Shift+PrintScreen
@@ -59,7 +61,8 @@ ${color2}show scratchpad - ${color}mod+minus
 ${color2}modify gaps - ${color}mod+Shift+g
 ${color2}resize mode - ${color}mod+r
 ${color2}toggle split direction - ${color}mod+q
-${color2}kill focused - ${color}mod+Shift+q
+${color2}kill cursor selection - ${color}mod+Ctrl+q
+${color2}kill active window - ${color}mod+Shift+q
 
 ---------------Workspace--------------------
 ${color2}move to empty workspace - ${color}mod+Shift+z
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 183c63d..a56baa8 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -49,9 +49,10 @@ workspace 3 output DP-2
 
 # Open applications on specific workspaces
 assign [class="Bitwarden"] 1
-assign [class="Signal"] 1
-assign [class="Firefox"] 3
-# assign [class="Skype"] $ws5
+assign [class="Discord"] 1
+assign [class="Firefox"] 2
+assign [class="Geary"] 3
+assign [class="Signal"] 8
 
 ################################################################
 ### Window / App Settings ######################################
@@ -94,10 +95,16 @@ for_window [urgent=latest] focus
 ################################################################
 
 # Start on boot
+
+# Initialize display settings
 exec --no-startup-id autorandr.sh --change --default ~/.autorandr/kapp/config
+# Startup apps
 exec --no-startup-id signal-desktop
+exec --no-startup-id discord
+exec --no-startup-id geary
 exec --no-startup-id bitwarden
 exec --no-startup-id firefox
+# i3 default execs
 exec --no-startup-id /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 exec --no-startup-id nitrogen --restore; sleep 1; compton -b
 exec --no-startup-id nitrogen --restore
@@ -277,15 +284,18 @@ bindsym $mod+a exec tilix -q
 
 # Firefox
 bindsym $mod+F2 exec firefox
-# Signal
-bindsym $mod+F3 exec signal-desktop
+# Start Geary email client
+bindsym $mod+F3 exec geary
+# Start Discord
+bindsym $mod+F4 exec terminal -e 'mocp'
+# Start Signal
+bindsym $mod+F5 exec signal-desktop
 # Bitwarden
-bindsym $mod+F4 exec bitwarden
-# bindsym $mod+F3 exec ranger
+bindsym $mod+F6 exec bitwarden
 # Start PCManfm filemanager
-bindsym $mod+Shift+F3 exec pcmanfm_pkexec
+bindsym $mod+F8 exec pcmanfm_pkexec
 # Start mocp music player
-bindsym $mod+F5 exec terminal -e 'mocp'
+#bindsym $mod+F5 exec terminal -e 'mocp'
 
 #   Screenshot keybinds
 ###########################################
@@ -324,9 +334,9 @@ bindsym $mod+Shift+d --release exec "killall dunst; exec notify-send 'restart du
 
 # Display cursor to select X window to kill
 # Misclicks can be dangerous
-bindsym $mod+Ctrl+x --release exec --no-startup-id xkill
+bindsym $mod+Ctrl+q --release exec --no-startup-id xkill
 
-# kill focused window
+# Kill active window
 bindsym $mod+Shift+q kill
 
 #   i3 system / menus keybinds