From 18e27b7b8448a04749c7e122e17392130c7a18e7 Mon Sep 17 00:00:00 2001
From: John D Pell <John+Git@gaelicWizard.net>
Date: Thu, 17 Feb 2022 21:52:47 -0800
Subject: [PATCH] aliases/editor: split out editor shortcuts

---
 aliases/available/editor.aliases.bash  | 14 ++++++++++++++
 aliases/available/general.aliases.bash | 10 +---------
 aliases/available/vim.aliases.bash     |  6 ++++--
 profiles/default.bash_it               |  1 +
 4 files changed, 20 insertions(+), 11 deletions(-)
 create mode 100644 aliases/available/editor.aliases.bash

diff --git a/aliases/available/editor.aliases.bash b/aliases/available/editor.aliases.bash
new file mode 100644
index 00000000..654f910f
--- /dev/null
+++ b/aliases/available/editor.aliases.bash
@@ -0,0 +1,14 @@
+# shellcheck shell=bash
+about-alias 'shortcuts for editing'
+
+alias edit='${EDITOR:-${ALTERNATE_EDITOR:-nano}}'
+alias e='edit'
+
+# sudo editors
+alias svim='sudo ${VISUAL:-vim}'
+alias snano='sudo ${ALTERNATE_EDITOR:-nano}'
+alias sedit='sudo ${EDITOR:-${ALTERNATE_EDITOR:-nano}}'
+
+# Shortcuts to edit startup files
+alias vbrc='${VISUAL:-vim} ~/.bashrc'
+alias vbpf='${VISUAL:-vim} ~/.bash_profile'
diff --git a/aliases/available/general.aliases.bash b/aliases/available/general.aliases.bash
index 3cfa5727..539940b2 100644
--- a/aliases/available/general.aliases.bash
+++ b/aliases/available/general.aliases.bash
@@ -4,10 +4,6 @@ about-alias 'general aliases'
 
 alias _='sudo'
 
-# Shortcuts to edit startup files
-alias vbrc='"${VISUAL:-vim}" ~/.bashrc'
-alias vbpf='"${VISUAL:-vim}" ~/.bash_profile'
-
 # colored grep
 # Need to check an existing file for a pattern that will be found to ensure
 # that the check works when on an OS that supports the color option
@@ -22,7 +18,6 @@ fi
 alias c='clear'
 alias cls='clear'
 
-alias edit='${EDITOR:-${ALTERNATE_EDITOR?}}'
 alias pager='${PAGER:-less}'
 
 alias q='exit'
@@ -50,10 +45,6 @@ fi
 # Shorten extract
 alias xt='extract'
 
-# sudo editors
-alias svim='sudo "${VISUAL:-vim}"'
-alias snano='sudo "${ALTERNATE_EDITOR:-nano}"'
-
 # Display whatever file is regular file or folder
 function catt() {
 	for i in "$@"; do
@@ -73,3 +64,4 @@ function catt() {
 # bash-it enable alias bash-it
 source "$BASH_IT/aliases/available/bash-it.aliases.bash"
 source "$BASH_IT/aliases/available/directory.aliases.bash"
+source "$BASH_IT/aliases/available/editor.aliases.bash"
diff --git a/aliases/available/vim.aliases.bash b/aliases/available/vim.aliases.bash
index f8068764..d6383175 100644
--- a/aliases/available/vim.aliases.bash
+++ b/aliases/available/vim.aliases.bash
@@ -1,9 +1,11 @@
 # shellcheck shell=bash
 about-alias 'vim abbreviations'
 
-_command_exists vim || return
+alias v='${VISUAL:-vim}'
 
-alias v='vim'
+if ! _command_exists vim; then
+	_log_warning "Without 'vim', these aliases just aren't that useful..."
+fi
 # open the vim help in fullscreen incorporated from
 # https://stackoverflow.com/a/4687513
 alias vimh='vim -c ":h | only"'
diff --git a/profiles/default.bash_it b/profiles/default.bash_it
index 8a8ee26c..7985e501 100644
--- a/profiles/default.bash_it
+++ b/profiles/default.bash_it
@@ -12,3 +12,4 @@ completion system
 aliases general
 aliases bash-it
 aliases directory
+aliases editor