diff --git a/.config/bootstrap/config_common b/.config/bootstrap/config_common
index 300ae24..6a25cd4 100644
--- a/.config/bootstrap/config_common
+++ b/.config/bootstrap/config_common
@@ -7,6 +7,7 @@ dunst
 feh
 firefox
 flameshot
+fzf
 htop
 i3-wm
 i3lock-color
diff --git a/.init_config.sh b/.init_config.sh
index 7ad5d79..9590d37 100755
--- a/.init_config.sh
+++ b/.init_config.sh
@@ -95,6 +95,10 @@ if [ ! -z "$INIT" ]; then
 	gsettings set org.cinnamon.desktop.default-applications.terminal exec i3-sensible-terminal
 	# For screenshots
 	pip install pychee
+	# Additionnal plugins for ZSH
+	sudo git clone https://github.com/zsh-users/zsh-syntax-highlighting.git /usr/share/oh-my-zsh/plugins/zsh-syntax-highlighting
+	sudo git clone https://github.com/zsh-users/zsh-autosuggestions /usr/share/oh-my-zsh/plugins/zsh-autosuggestions
+	sudo git clone https://github.com/unixorn/fzf-zsh-plugin.git /usr/share/oh-my-zsh/plugins/fzf-zsh-plugin
 fi
 
 if [ ! -z ${ENV} ]; then
diff --git a/.zshrc b/.zshrc
index 4341f04..a5ca339 100644
--- a/.zshrc
+++ b/.zshrc
@@ -19,6 +19,10 @@ COMPLETION_WAITING_DOTS="true"
 # stamp shown in the history command output.
 # The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd"
 HIST_STAMPS="dd.mm.yyyy"
+# Global history search
+HISTFILE=~/.zsh_history
+HISTSIZE=10000 
+SAVEHIST=10000
 
 # Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*)
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
@@ -41,10 +45,16 @@ plugins=(
   docker
   # unique command for most archives
   extract
+  # fuzzy finder for history, files, docker, process, etc (see fzf)
+  fzf-zsh-plugin
   # aliases
   git
   # password-store autocomplete
   pass
+  # fish-like completion as you type
+  zsh-autosuggestions
+  # fish-like syntax hightlightin as you type
+  zsh-syntax-highlighting
 )
 
 # Enable option stacking in autocomplete, i.e. docker run -it <TAB>