From b4dd5794d2ec64aa7fee861d4b8551488b6948e2 Mon Sep 17 00:00:00 2001
From: Aminda Suomalainen <suomalainen+git@mikaela.info>
Date: Thu, 19 Oct 2023 09:51:32 +0300
Subject: [PATCH] {bash,zsh}rc: turn vim alias into a function

Resolves: #160
Resolves: sudo vim
---
 rc/bashrc | 20 +++++++++++++-------
 rc/zshrc  | 19 ++++++++++++-------
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/rc/bashrc b/rc/bashrc
index 79042b72..5d0919d6 100755
--- a/rc/bashrc
+++ b/rc/bashrc
@@ -541,13 +541,6 @@ fi
 # More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
 alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
 
-# I use nvim, while I keep running vim instead
-if hash nvim 2>/dev/null; then
-	alias vim="echo 'using nvim instead' && nvim"
-else
-	alias vim="echo 'nvim not found' && \vim"
-fi
-
 # Allow custom aliases to be put in .aliases or .bash_aliases .
 
 # .aliases
@@ -814,6 +807,19 @@ ssh-verify-file() {
 	ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig <$2
 }
 
+# I use nvim, while I keep running vim instead
+if hash nvim 2>/dev/null; then
+	vim() {
+		echo 'using nvim instead'
+		nvim $@
+	}
+else
+	vim() {
+		echo 'nvim not found'
+		\vim $@
+	}
+fi
+
 # Source files for miscannellious modifications.
 
 # acme.sh
diff --git a/rc/zshrc b/rc/zshrc
index 21c11498..b28b7022 100755
--- a/rc/zshrc
+++ b/rc/zshrc
@@ -523,13 +523,6 @@ fi
 # More simple SSH file signing, ~/.ssh/signingkey.pub should be a symlink
 alias ssh-sign-file="ssh-keygen -Y sign -f ~/.ssh/signingkey.pub -n file"
 
-# I use nvim, while I keep running vim instead
-if hash nvim 2>/dev/null; then
-	alias vim="echo 'using nvim instead' && nvim"
-else
-	alias vim="echo 'nvim not found' && \vim"
-fi
-
 # Allow custom aliases to be put in .aliases or .zsh_aliases .
 
 # .aliases
@@ -800,6 +793,18 @@ ssh-verify-file () {
 	ssh-keygen -Y verify -f $sshAllowedSigners -I $1 -n file -s $2.sig < $2
 }
 
+# I use nvim, while I keep running vim instead
+if hash nvim 2>/dev/null; then
+	vim() {
+		echo 'using nvim instead'
+		nvim $@
+	}
+else
+	vim() {
+		echo 'nvim not found'
+		\vim $@
+	}
+fi
 
 # Source files for miscannellious modifications.