Merge branch 'master' into cla

2 files changed, 13 insertions, 2 deletions

diff --git a/sh/aliases b/sh/aliases
index 2d2aa27..a56a25c 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -21,6 +21,9 @@ case `uname -s` in
     #alias ls="ls -h $COLOR_FLAGS_GNU"
     alias ls="eza"
     ;;
+  "Darwin")
+    alias ls="eza --color"
+    ;;
 esac
 alias ll='ls -l'
 alias lt='ls -l --total-size'
@@ -36,8 +39,14 @@ alias nv='nvim'
 alias v='nvim'
 
 ## Change utils
-#alias rm='rm -i'
-alias rm='trash-put'
+case `uname -s` in
+  "OpenBSD" | "Darwin")
+    alias rm='rm -i'
+    ;;
+  "Linux")
+    alias rm='trash-put'
+    ;;
+esac
 alias cp='cp -i'
 alias srsync='rsync -KPUcrtvyz'
 
diff --git a/sh/profile b/sh/profile
index e9ca8e5..4643335 100644
--- a/sh/profile
+++ b/sh/profile
@@ -22,6 +22,8 @@ export ADB_VENDOR_KEY="$XDG_CONFIG_HOME"/android
 export LESSHISTFILE=-
 
 # Fixing Paths
+export ZPLUG_HOME="$XDG_DATA_HOME/zplug"
+export DOTNET_CLI_HOME="$XDG_DATA_HOME"/dotnet
 export MBSYNCRC="$XDG_CONFIG_HOME"/isync/mbsyncrc
 export ATOM_HOME="$XDG_DATA_HOME"/atom
 export XINITRC="$XDG_CONFIG_HOME"/X11/xinitrc