Clean alias

1 files changed, 15 insertions, 16 deletions

diff --git a/dotfiles/zsh/01-aliases.zsh b/dotfiles/zsh/01-aliases.zsh
index 94f57f8..a580715 100755
--- a/dotfiles/zsh/01-aliases.zsh
+++ b/dotfiles/zsh/01-aliases.zsh
@@ -18,10 +18,10 @@
 #alias la='ls -lahF --color=auto --group-directories-first --time-style=+"%d.%m.%Y %H:%M"'
 #alias ll='ls -lhF --color=auto --group-directories-first --time-style=+"%d.%m.%Y %H:%M"'
 #alias ls='ls -F --color=auto --group-directories-first'
-alias ls="exa"
-alias la="exa -a"
-alias ll="exa -l"
-alias lg="exa -l --git"
+alias exa="exa --icons"
+alias exal="exa -alh --icons"
+alias exaa="exa -aalh --icons"
+alias exag="exa -alh --git --icons"
 llo() { ls -l "$@" | awk '{k=0;for(i=0;i<=8;i++)k+=((substr($1,i+2,1)~/[rwx]/)*2^(8-i));if(k)printf(" %0o ",k);print}'; }
 alias ".."="cd ../"
 alias "..."="cd ../.."
@@ -33,17 +33,17 @@ alias rmr="rm -if"
 alias rmrf="rm -irf"
 alias psef="ps -ef"
 alias mkdir="mkdir -pv"
-#alias cp="cp -r"
-alias cp="rsync -ahv --progress"
-alias cps="sudo rsync -ahv --progress"
-alias scp="scp -r"
-alias xsel="xsel -b"
+alias cpr="cp -r"
+alias rs="rsync -ahv --progress"
+alias rss="sudo rsync -ahv --progress"
+alias scpr="scp -r"
+alias xselb="xsel -b"
 #alias fuck='sudo $(fc -ln -1)'
 alias v="nvim"
-alias vi="nvim"
-alias emacs="nvim"
+#alias vi="nvim"
+#alias emacs="nvim"
 alias vs="sudo -E nvim"
-alias edit="nvim"
+#alias edit="nvim"
 alias vinstall="v +PluginInstall +qall"
 alias g="git"
 alias ga="git add -p"
@@ -63,7 +63,6 @@ alias gcs="git commit -S -m"
 alias gcurl="git config --get remote.origin.url"
 #alias gpr="hub pull-request" To use with hub command
 #alias ag="ag --color --color-line-number '0;35' --color-match '46;30' --color-path '4;36'"
-alias ag="rg"
 alias tree='tree -CAFa -I "CVS|*.*.package|.svn|.git|.hg|node_modules|bower_components" --dirsfirst'
 alias mixer="alsamixer"
 #alias genplaylist="cd ~/music;find . -name '*.mp3' -o -name '*.flac'|sed -e 's%^./%%g' > ~/.mpd/playlists/all.m3u"
@@ -114,7 +113,7 @@ alias weenotistop="~/.scripts/weechat_notify.sh stop"
 alias fixit='sudo rm -f /var/lib/pacman/db.lck'
 #alias mirrors='sudo pacman-mirrors -g'
 alias printer='sudo system-config-printer'
-alias bat="upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep 'percentage:' | awk '{print $2}'"
+alias battery="upower -i /org/freedesktop/UPower/devices/battery_BAT0 | grep 'percentage:' | awk '{print $2}'"
 alias t="task"
 alias ts="task sync"
 alias tcal="task calendar"
@@ -132,7 +131,7 @@ alias tunsetnext="task modify $@ -next"
 alias tproject="task project:"
 alias tmodify="task modify"
 alias tedit="task edit"
-alias rl='source ~/.zsh/aliases.zsh; xrdb -merge ~/.Xresources'
+alias rl='source ~/.zsh/01-aliases.zsh; xrdb -merge ~/.Xresources'
 alias rssyoutube="newsboat -c /home/neodarz/.newsboat/youtube.db -u /home/neodarz/.newsboat/urls_youtube -C /home/neodarz/.newsboat/youtube_conf"
 alias rssliberte="newsboat -c /home/neodarz/.newsboat/liberte.db -u /home/neodarz/.newsboat/urls_liberte -C /home/neodarz/.newsboat/liberte_conf"
 alias rssblog="newsboat -c /home/neodarz/.newsboat/blog.db -u /home/neodarz/.newsboat/urls_blog -C /home/neodarz/.newsboat/blog_conf"
@@ -147,7 +146,7 @@ alias calendar="/bin/cal"
 alias cal="ikhal"
 alias cals="vdirsyncer sync linuxmaine && vdirsyncer sync haum && ikhal"
 alias calsync="vdirsyncer sync perso && vdirsyncer sync pro && vdirsyncer sync imie"
-alias mm="offlineimap &&  neomutt"
+alias mm="offlineimap &&  notmuch new && neomutt"
 alias reboot="sshs disable; timew stop @1; sudo reboot"
 alias terminus="~/Apps/terminus-pantheon/vendor/bin/terminus"
 alias sulfur="ncmpcpp -h sulfur -p 6600"