git: inherit current upstream when creating a new branch

[dotfiles.git] / aliases

diff --git a/aliases b/aliases
index 57dbfb8fe74e79afb909419b010f55bfec049819..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'
 
@@ -15,6 +14,10 @@ alias free='free -m'             # show sizes in MB
 
 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
         for f in "$@"; do
             if [[ "${f:0:1}" == "-" ]]; then
                 echo "Running in Vim's terminal, not accepting options!" >&2
@@ -24,11 +27,12 @@ if [[ -n "${VIM_TERMINAL}" ]]; then
         for f in "$@"; do
             # drop the file onto the running vim instance
             # see :h terminal-communication
-            echo -e "\e]51;[\"drop\", \"$f\"]\a"
+            local abspath=$(realpath $f)
+            echo -e "\e]51;[\"drop\", \"$abspath\"]\a"
         done
     }
 fi
-alias vi='vim'
+alias vi=nvim
 alias svi='sudo -e'
 #alias vp='vim PKGBUILD' # I have a script for that in ~/bin
 alias vs='vim SPLITBUILD'