merge

Signed-off-by: Tuan-Dat Tran <tuan-dat.tran@tudattr.dev>

zsh/.zshrc

@@ -6,6 +6,14 @@ export PenTestTools=$HOME/Local/PenTesting/
 export CTF=$HOME/Documents/CTF/
 export WORKSPACE=$HOME/workspace_l
 export ZSHRC="$HOME/.zshrc"
+<<<<<<< HEAD
+||||||| e9d53f0
+export VISUAL="emacsclient -t"
+export EDITOR="emacsclient -t"
+=======
+export VISUAL="nvim"
+export EDITOR="nvim"
+>>>>>>> clean_emacs
 
 
 # History
@@ -44,6 +52,8 @@ setopt SHARE_HISTORY
 # Alias
 alias q="exit"
 alias b="byobu"
+alias vim="nvim"
+alias cat="bat --pager=never"
 alias ranger='ranger --choosedir=$HOME/.rangerdir; LASTDIR=`cat $HOME/.rangerdir`; cd "$LASTDIR"'
 alias xsel='xsel -ib'
 alias msfconsole="msfconsole -x \"db_connect metasploit@msf\""
@@ -62,6 +72,7 @@ alias notify="dunstify \"ping~\""
 alias ekill="pkill emacs; pkill emacsclient; ed"
 alias latexmk="latexmk -f -pdf -interaction=nonstopmode"
 alias picotik="picocom --b 115200 /dev/ttyUSB0"
+alias ls="eza"
 ## git
 alias gps="git push soft --all"
 alias gras="add_soft_git"