Merge branch 'master' into cla

2 files changed, 10 insertions, 7 deletions

diff --git a/sh/aliases b/sh/aliases
index 1b6606e..4fc427f 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -18,12 +18,14 @@ 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"
     ;;
 esac
 alias ll='ls -l'
-alias la='ls -A'
-alias lla='ls -lA'
+alias lt='ls -l --total-size'
+alias la='ls -a'
+alias lla='ls -la'
 alias lb='lsblk'
 alias md='mkdir -p'
 alias ch='cd $HOME'
@@ -33,7 +35,8 @@ alias nv='nvim'
 alias v='nvim'
 
 ## Change utils
-alias rm='rm -i'
+#alias rm='rm -i'
+alias rm='trash-put'
 alias cp='cp -i'
 alias srsync='rsync -KPUcrtvyz'
 
diff --git a/sh/profile b/sh/profile
index 61b224c..e9ca8e5 100644
--- a/sh/profile
+++ b/sh/profile
@@ -56,9 +56,9 @@ export XCURSOR_PATH="/usr/share/icons:$XDG_DATA_HOME/icons"
 export PYTHONSTARTUP="$XDG_CONFIG_HOME"/python/pythonrc
 
 # Scaling
-export QT_AUTO_SCREEN_SCALE_FACTOR=0
-export QT_SCALE_FACTOR=1
-export QT_SCREEN_SCALE_FACTORS="1;1;1"
+#export QT_AUTO_SCREEN_SCALE_FACTOR=0
+#export QT_SCALE_FACTOR=1
+#export QT_SCREEN_SCALE_FACTORS="1;1;1"
 export GDK_SCALE=1
 export GDK_DPI_SCALE=1