diff --git a/fish/config.fish b/.config/fish/config.fish
similarity index 100%
rename from fish/config.fish
rename to .config/fish/config.fish
diff --git a/starship.toml b/.config/starship.toml
similarity index 100%
rename from starship.toml
rename to .config/starship.toml
diff --git a/.loadenv.sh b/.loadenv.sh
index 7944229..12c6aa3 100644
--- a/.loadenv.sh
+++ b/.loadenv.sh
@@ -2,8 +2,17 @@ export LUA_PATH='/usr/share/lua/5.4/?.lua;/usr/share/lua/5.4/?/init.lua;/usr/lib
 export LUA_CPATH='/usr/lib64/lua/5.4/?.so;/usr/lib64/lua/5.4/loadall.so;./?.so;/home/sortion/.luarocks/lib/lua/5.4/?.so;/usr/lib/lua/5.4/?.so'
 export PATH='/home/sortion/.luarocks/bin:/home/sortion/.julia/bin:/home/sortion/.nvm/versions/node/v17.9.1/bin:/home/sortion/.cargo/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/opt/quarto-1.3.433/bin:/home/sortion/.local/bin:/home/sortion/bin:/home/sortion/.antigen/bundles/robbyrussell/oh-my-zsh/lib:/home/sortion/.antigen/bundles/zsh-users/zsh-syntax-highlighting:/home/sortion/.antigen/bundles/robbyrussell/oh-my-zsh/plugins/git:/home/sortion/Documents/cours/tools/bin/:/usr/games/'
 
+export EDITOR=vim
+
 export TEXMFHOME=~/.texmf
 
+# Change ls colors using vivid if installed
+if type vivid >/dev/null; then
+	export LS_COLORS="$(vivid -m 8-bit generate one-dark)"
+fi
+
+eval $(thefuck --alias)
+
 # >>> conda initialize >>>
 # !! Contents within this block are managed by 'conda init' !!
 __conda_setup="$('/home/sortion/.local/share/mambaforge/bin/conda' 'shell.zsh' 'hook' 2>/dev/null)"
diff --git a/.zshrc b/.zshrc
index ab62a7a..b143d53 100644
--- a/.zshrc
+++ b/.zshrc
@@ -10,14 +10,12 @@ antigen use oh-my-zsh
 
 antigen bundle nerdfonts
 
-antigen theme ys 
+antigen theme ys
 
 antigen bundle chucknorris
 
 antigen bundle rand-quote
 
-# antigen bundle nojhan/liquidprompt
-
 antigen bundle zsh-users/zsh-syntax-highlighting
 
 antigen bundle zsh-users/zsh-completions
@@ -28,18 +26,24 @@ antigen bundle colored-man-pages
 
 antigen bundle git
 
+antigen bundle nojhan/liquidprompt
+
 antigen apply
 
-# source ~/.antigen/bundles/nojhan/liquidprompt/liquidprompt
+source ~/.antigen/bundles/nojhan/liquidprompt/liquidprompt
 
 # source ~/.antigen/bundles/nojhan/liquidprompt/themes/powerline/powerline.theme && lp_theme powerline
 
-# source ~/.antigen/bundles/nojhan/lp-dotmatrix/presets/variant-chevron.conf
+source ~/.antigen/bundles/nojhan/lp-dotmatrix/presets/variant-chevron.conf
 
-# source ~/.antigen/bundles/nojhan/lp-dotmatrix/dotmatrix.theme && lp_theme dotmatrix
+source ~/.antigen/bundles/nojhan/lp-dotmatrix/dotmatrix.theme && lp_theme dotmatrix
 
 # source <(/home/sortion/.cargo/bin/starship init zsh --print-full-init)
 
-if ! type /usr/bin/fortune > /dev/null; then
-        fortune
+export DOTMATRIX_SPACED=1
+
+# if [ "$TMUX" = "" ]; then tmux; fi
+
+if type fortune > /dev/null; then
+  fortune
 fi
diff --git a/Makefile b/Makefile
index 7290590..ac9e125 100644
--- a/Makefile
+++ b/Makefile
@@ -15,12 +15,11 @@ source: fishcfg
 
 fishcfg:
 	mkdir -p ~/.config/fish
-	cp ./fish/config.fish ~/.config/fish/config.fish
+	cp ./.config/fish/config.fish ~/.config/fish/config.fish
 	cp ./.aliases.fish ~/.aliases.fish
-	cp starship.toml ~/.config/starship.toml
+	cp ./.config/starship.toml ~/.config/starship.toml
 
-nvim:
-	
+nvim:	
 
 antigen:
 	git clone https://github.com/zsh-users/antigen.git