From 351169c859cf284b7e66c2e6e140cf607e9edcf2 Mon Sep 17 00:00:00 2001
From: liv <shadows_withal@fastmail.com>
Date: Tue, 30 May 2023 10:36:51 +0200
Subject: [PATCH] remove helix references

---
 dot_config/fish/config.fish | 8 +-------
 dot_gitconfig               | 2 +-
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/dot_config/fish/config.fish b/dot_config/fish/config.fish
index b791af6..f608607 100644
--- a/dot_config/fish/config.fish
+++ b/dot_config/fish/config.fish
@@ -39,7 +39,7 @@ zoxide init fish | source
 source ~/.config/fish/private.fish
 
 # Environment variables
-set -x EDITOR "helix"
+set -x EDITOR "vim"
 set -x USER "lu"
 set -x SHELL (which fish)
 set -x TERM xterm-256color
@@ -92,12 +92,6 @@ alias wip "g add --all; and g commit -m WIP"
 alias squish "gs; and g commit -a --amend -C HEAD"
 alias editorigin "git remote set-url origin"
 
-# Alias vim to helix if it exists because vim is way easier to type
-if command --search helix > /dev/null
-  alias hx "helix"
-  alias vim "hx"
-end
-
 # Load asdf if it's installed
 if test -e ~/.asdf
   . ~/.asdf/asdf.fish  
diff --git a/dot_gitconfig b/dot_gitconfig
index 9bddd44..f749287 100644
--- a/dot_gitconfig
+++ b/dot_gitconfig
@@ -3,7 +3,7 @@
 	email = shadows_withal@fastmail.com
 	signingkey = 0x6F33B647A7AC80CE
 [core]
-	editor = helix
+	editor = vim
 [push]
 	default = simple
 [pull]