diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index fd98546..5f8280a 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -33,6 +33,8 @@ vim.g.netrw_banner   = 0
 
 vim.o.lazyredraw     = true
 
+vim.o.complete       = vim.o.complete .. ",i"
+
 --------------------
 ----- packages -----
 --------------------
@@ -53,4 +55,8 @@ require"pack-which-key"
 -----------------------
 
 -- remove trailing whitespaces
+vim.keymap.set("n", "<Leader>e", "<cmd>exe getline(line('.'))<CR>")
 vim.keymap.set("n", "<Leader>f", "<cmd>%s/\\s\\+$//e<CR>")
+vim.keymap.set("n", "s",         '"_d')
+vim.keymap.set("n", "ss",        '"_dd')
+vim.keymap.set("n", "S",         '"_D')
diff --git a/.config/zsh/.zsh_aliases b/.config/zsh/.zsh_aliases
index 9b7f643..dbdb11c 100644
--- a/.config/zsh/.zsh_aliases
+++ b/.config/zsh/.zsh_aliases
@@ -1,13 +1,14 @@
-alias cls='clear && l'
-alias config="git --git-dir=$HOME/.dotfiles --work-tree=$HOME"
-alias startgui="sway 2> $HOME/sway.log"
-alias tmp="cd $(mktemp -d)"
+alias cls='clear && ls -lah'
+alias config='git --git-dir=$HOME/.dotfiles --work-tree=$HOME'
+alias startgui='sway 2> $HOME/sway.log'
+alias tmp='cd $(mktemp -d)'
 alias umnt='sudo umount /mnt -R'
-alias vi="$EDITOR"
-alias epitest="docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker:latest bash"
+alias vi='$EDITOR'
+alias epitest='docker run -it --rm -v $PWD:/usr/app/ epitechcontent/epitest-docker bash'
+alias automount='D=$(udisksctl mount -b /dev/sda1 2> /dev/null || udisksctl mount -b /dev/sdb1) && cd ${D/* }'
 
-alias wconf="$EDITOR $HOME/.config/sway"
-alias zshconf="$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc"
+alias wconf='$EDITOR $HOME/.config/sway'
+alias zshconf='$EDITOR $ZDOTDIR/.zshrc && . $ZDOTDIR/.zshrc'
 
 alias ssh='TERM=linux ssh'
 
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 9f9188c..e0e3411 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -74,7 +74,7 @@ zstyle ':omz:update' mode disabled  # disable automatic updates
 # Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
-plugins=(git vi-mode)
+plugins=(git vi-mode colored-man-pages gitignore)
 
 . "$ZSH"/oh-my-zsh.sh