Merge branch 'master' into rai-master

1 files changed, 29 insertions, 6 deletions

diff --git a/sh/aliases b/sh/aliases
index e33c3a9..93784e7 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -18,22 +18,35 @@ case `uname -s` in
     alias ls="ls -h"
     ;;
   "Linux")
-    alias ls="ls -h $COLOR_FLAGS_GNU"
+    #alias ls="ls -h $COLOR_FLAGS_GNU"
+    alias ls="eza"
+    ;;
+  "Darwin")
+    alias ls="eza --color"
     ;;
 esac
 alias ll='ls -l'
-alias la='ls -A'
-alias lla='ls -lA'
+alias lt='ls -l --total-size'
+alias lts='ls -l --total-size --sort size --reverse'
+alias la='ls -a'
+alias lla='ls -la'
+alias lb='lsblk'
 alias md='mkdir -p'
 alias ch='cd $HOME'
 
 #alias nvim='vim'
 alias nv='nvim'
 alias v='nvim'
-#alias lf='lfrun'
 
 ## Change utils
-alias rm='rm -i'
+case `uname -s` in
+  "OpenBSD" | "Darwin")
+    alias rm='rm -i'
+    ;;
+  "Linux")
+    alias rm='trash-put'
+    ;;
+esac
 alias cp='cp -i'
 alias srsync='rsync -KPUcrtvyz'
 
@@ -44,7 +57,7 @@ alias ga='git add -A'
 alias gd='git diff'
 
 ## Single Chars
-alias r='cd ~ && clear && exec $SHELL'
+alias r='cd ~ && reset && exec $SHELL'
 alias q='exit'
 alias c='clear'
 alias m='make'
@@ -71,5 +84,15 @@ case `uname -s` in
     ;;
 esac
 
+## Systemctl
+alias us='systemctl --user'
+alias s='sudo systemctl'
+
 ## Runit
 #alias ursm='env SVDIR="$HOME/.local/sv/" rsm'
+
+# XDG dirs fix
+alias svn="svn --config-dir $XDG_CONFIG_HOME/subversion"
+alias adb="HOME="$XDG_DATA_HOME"/android adb"
+alias wget="wget --hsts-file=\"$XDG_DATA_HOME/wget-hsts\""
+alias yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"