From 765a7645bd4590ade56b757cb399a0917f34b491 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Thu, 21 Jul 2022 11:53:08 -0500
Subject: [PATCH] HELIX

---
 common/fish/functions.fish |  3 ---
 common/fish/vars.fish      | 10 +++++-----
 common/helix/config.toml   |  6 +++++-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/common/fish/functions.fish b/common/fish/functions.fish
index c627f3c..44c27e2 100644
--- a/common/fish/functions.fish
+++ b/common/fish/functions.fish
@@ -105,13 +105,10 @@ if has_command kubectl
 	alias kg "k get"
 end
 
-alias vim $EDITOR
-alias vi $EDITOR
 alias v $EDITOR
 alias e $EDITOR
 alias sv "sudo -E $EDITOR"
 alias se sv
-alias svim sv
 
 function ltl --wraps=ls --description "Echoes the name of the file most recently modified either in the current directory or in the given path"
 	set d $argv[1] .
diff --git a/common/fish/vars.fish b/common/fish/vars.fish
index 5550a2b..626f852 100644
--- a/common/fish/vars.fish
+++ b/common/fish/vars.fish
@@ -14,16 +14,16 @@ set --export --universal LESS "-r"
 
 set --export --universal MANPAGER 'env MANWIDTH="" "$EDITOR"'
 
-if command --search --quiet nvim
-	set --export --universal MANPAGER 'env MANWIDTH="" nvim --cmd "let g:prosession_on_startup=0" +Man!'
-	set --export --universal EDITOR nvim
-	set --export --universal VISUAL nvim
-else if command --search --quiet helix
+if command --search --quiet helix
 	set --export --universal EDITOR helix
 	set --export --universal VISUAL helix
 else if command --search --quiet hx
 	set --export --universal EDITOR hx
 	set --export --universal VISUAL hx
+else if command --search --quiet nvim
+	set --export --universal MANPAGER 'env MANWIDTH="" nvim --cmd "let g:prosession_on_startup=0" +Man!'
+	set --export --universal EDITOR nvim
+	set --export --universal VISUAL nvim
 else if command --search --quiet vim
 	set --export --universal EDITOR vim
 	set --export --universal VISUAL vim
diff --git a/common/helix/config.toml b/common/helix/config.toml
index da20ff6..e619530 100644
--- a/common/helix/config.toml
+++ b/common/helix/config.toml
@@ -24,9 +24,13 @@ g = { G = "goto_last_line" }
 D = "kill_to_line_end"
 C = ["kill_to_line_end", "insert_mode"]
 "^" = "goto_line_start"
+"C-k" = "jump_view_up"
+"C-j" = "jump_view_down"
+"C-h" = "jump_view_left"
+"C-l" = "jump_view_right"
 
 [keys.select]
 g = { G = "goto_last_line" }
 
 # [editor]
-# mouse = false
\ No newline at end of file
+# mouse = false