From 51ede48ebf42d3e0e573c1d588101c48ae8728b6 Mon Sep 17 00:00:00 2001
From: Price Hiller <price@orion-technologies.io>
Date: Fri, 12 Aug 2022 16:09:52 -0500
Subject: [PATCH] feat: better setup for new keyboard

---
 dots/.config/sway/conf/bindings.conf          | 28 ++++++++++---------
 dots/.config/wezterm/config/misc.lua          |  2 +-
 dots/.config/zsh/config/plugins/init.zsh      |  1 +
 dots/.config/zsh/config/plugins/zsh-vi-mode   |  1 +
 .../zsh/config/profile/profile/env.zsh        |  6 +++-
 .../zsh/config/profile/profile/keybinds.zsh   |  3 --
 6 files changed, 23 insertions(+), 18 deletions(-)
 create mode 160000 dots/.config/zsh/config/plugins/zsh-vi-mode

diff --git a/dots/.config/sway/conf/bindings.conf b/dots/.config/sway/conf/bindings.conf
index b3d3964f..f83bf684 100644
--- a/dots/.config/sway/conf/bindings.conf
+++ b/dots/.config/sway/conf/bindings.conf
@@ -27,7 +27,7 @@ bindsym {
     $mod+Space exec wofi --show drun --allow-images
     $mod+c exec wl-copy
     $mod+v exec wl-paste
-    $mod+l exec swaylock
+    $mod+Shift+l exec swaylock
 }
 
 # Kill focused window
@@ -63,10 +63,10 @@ bindsym {
 
 # Focus Windows
 bindsym {
-    $mod+Left focus left
-    $mod+Down focus down
-    $mod+Up focus up
-    $mod+Right focus right
+    $mod+h focus left
+    $mod+j focus down
+    $mod+k focus up
+    $mod+l focus right
 }
 
 # Reload configuration file
@@ -84,6 +84,8 @@ bindsym {
     # Media player controls
     XF86AudioPlay exec playerctl play-pause
     XF86AudioPause exec playerctl play-pause
+    XF86AudioNext exec playerctl next
+    XF86AudioPrev exec playerctl previous
     XF86AudioForward exec playerctl next
     XF86AudioRewind exec playerctl previous
 }
@@ -94,10 +96,10 @@ bindsym {
 set $mode_move_window "Move Window"
 mode $mode_move_window {
     bindsym {
-        Right move right
-        Left move left
-        Down move down
-        Up move up
+        l move right
+        h move left
+        j move down
+        k move up
         Escape mode "default"
     }
 }
@@ -106,10 +108,10 @@ mode $mode_move_window {
 set $mode_move_workspace_monitor "Move Workspace Monitor"
 mode $mode_move_workspace_monitor {
     bindsym {
-        Right move workspace to output right
-        Left move workspace to output left
-        Down move workspace to output down
-        Up move workspace to output up
+        l move workspace to output right
+        h move workspace to output left
+        j move workspace to output down
+        k move workspace to output up
         Escape mode "default"
     }
 }
diff --git a/dots/.config/wezterm/config/misc.lua b/dots/.config/wezterm/config/misc.lua
index 4b1d2632..b5d8d4db 100644
--- a/dots/.config/wezterm/config/misc.lua
+++ b/dots/.config/wezterm/config/misc.lua
@@ -4,6 +4,6 @@ return {
     exit_behavior = "Close",
     scrollback_lines = 20000,
     native_macos_fullscreen_mode = true,
-    -- term = "wezterm",
+    term = "wezterm",
     warn_about_missing_glyphs = true,
 }
diff --git a/dots/.config/zsh/config/plugins/init.zsh b/dots/.config/zsh/config/plugins/init.zsh
index 5adc4b56..cca444aa 100644
--- a/dots/.config/zsh/config/plugins/init.zsh
+++ b/dots/.config/zsh/config/plugins/init.zsh
@@ -8,6 +8,7 @@ init() {
 	source "${wkdir}/zsh-autosuggestions/zsh-autosuggestions.zsh"
 	source "${wkdir}/zsh-completions/zsh-completions.plugin.zsh"
 	source "${wkdir}/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
+	source "${wkdir}/zsh-vi-mode/zsh-vi-mode.zsh"
 	eval "$(lua "${wkdir}/z.lua/z.lua" --init zsh enhanced once)"
 
 	configure
diff --git a/dots/.config/zsh/config/plugins/zsh-vi-mode b/dots/.config/zsh/config/plugins/zsh-vi-mode
new file mode 160000
index 00000000..debe9c8a
--- /dev/null
+++ b/dots/.config/zsh/config/plugins/zsh-vi-mode
@@ -0,0 +1 @@
+Subproject commit debe9c8ad191b68b143230eb7bee437caba9c74f
diff --git a/dots/.config/zsh/config/profile/profile/env.zsh b/dots/.config/zsh/config/profile/profile/env.zsh
index 432ce32a..06c3baed 100644
--- a/dots/.config/zsh/config/profile/profile/env.zsh
+++ b/dots/.config/zsh/config/profile/profile/env.zsh
@@ -10,7 +10,11 @@ export ZSH_AUTOSUGGEST_STRATEGY=(history completion)
 
 
 ### FZF ###
-[[ -r "${XDG_CONFIG_HOME}/fzf/fzf.zsh" ]]  && source "${XDG_CONFIG_HOME}/fzf/fzf.zsh"
+zvm_after_init ()
+{
+	[[ -r "${XDG_CONFIG_HOME}/fzf/fzf.zsh" ]]  && source "${XDG_CONFIG_HOME}/fzf/fzf.zsh"
+}
+
 export FZF_DEFAULT_COMMAND='fd --hidden --exclude .git --color=always'
 export FZF_DEFAULT_OPTS="--height=80% --layout=reverse --info=inline --border --margin=1 --ansi"
 export FZF_CTRL_T_COMMAND="${FZF_DEFAULT_COMMAND}"
diff --git a/dots/.config/zsh/config/profile/profile/keybinds.zsh b/dots/.config/zsh/config/profile/profile/keybinds.zsh
index f55bd29a..e69de29b 100644
--- a/dots/.config/zsh/config/profile/profile/keybinds.zsh
+++ b/dots/.config/zsh/config/profile/profile/keybinds.zsh
@@ -1,3 +0,0 @@
-autoload -z edit-command-line
-zle -N edit-command-line
-bindkey "^X^E" edit-command-line