nvim: provide wrappers to lazy.core.util.{error,warn,info}

[dotfiles.git] / aliases

diff --git a/aliases b/aliases
index 6fb1ae18bc3ef314a986d2de9fb62b8652636cef..e7b0a12f861c309dd1736187e6b62df5bd99743b 100644 (file)
--- a/aliases
+++ b/aliases
@@ -2,9 +2,8 @@
 # this will allow aliasing any command after sudo
 alias sudo='sudo '
 
-alias ls='ls --color=auto'
-alias l='ls --color=auto -F'
 alias ls='ls --color=auto -F'
+alias l='ls'
 alias ll='ls -lh --color=auto -F'
 alias la='ls -lha --color=auto -F'
 
@@ -13,27 +12,27 @@ alias df='df -h'                 # human-readable sizes
 du() { /usr/bin/du -h ${@} | sort -h }
 alias free='free -m'             # show sizes in MB
 
-# run vim or drop file in parent vim instance if inside vim terminal
-function vim {
-    if [[ -z "${VIM_TERMINAL}" ]]; then
-        # Not in VIM_TERMINAL, simply run vim with all arguments
-        command vim "$@"
-        return
-    fi
-
-    for f in "$@"; do
-        if [[ "${f:0:1}" == "-" ]]; then
-            echo "Running in Vim's terminal, not accepting options!" >&2
-            return 1
+if [[ -n "${VIM_TERMINAL}" ]]; then
+    function vim() {
+        if (( ${#@} == 0 )); then
+            echo "Running in Vim's terminal, at least one file must be given!" >&2
+            return 22
         fi
-    done
-    for f in "$@"; do
-        # drop the file onto the running vim instance
-        # see :h terminal-communication
-        echo -e "\e]51;[\"drop\", \"$f\"]\a"
-    done
-}
-alias vi='vim'
+        for f in "$@"; do
+            if [[ "${f:0:1}" == "-" ]]; then
+                echo "Running in Vim's terminal, not accepting options!" >&2
+                return 1
+            fi
+        done
+        for f in "$@"; do
+            # drop the file onto the running vim instance
+            # see :h terminal-communication
+            local abspath=$(realpath $f)
+            echo -e "\e]51;[\"drop\", \"$abspath\"]\a"
+        done
+    }
+fi
+alias vi=nvim
 alias svi='sudo -e'
 #alias vp='vim PKGBUILD' # I have a script for that in ~/bin
 alias vs='vim SPLITBUILD'