diff --git a/config.d/chezmoi.bash b/config.d/chezmoi.bash
new file mode 100644
index 0000000..65f4b46
--- /dev/null
+++ b/config.d/chezmoi.bash
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+# Configuration for chezmoi
+
+# git_repo="https://github.com/AstroNvim/template"
+# git_branch="main"
+
+git_repo="https://gitea.cloud.logerais.com/xavier/config-chezmoi.git"
+git_branch="main"
+
+if (command -v chezmoi); then
+    chezmoi init https://gitea.cloud.logerais.com/xavier/config-chezmoi.git
+    chezmoi apply ~/.config/mise
+    mise install
+fi
diff --git a/tools.d/anyenv.bash b/deprecated.d/anyenv.bash
similarity index 100%
rename from tools.d/anyenv.bash
rename to deprecated.d/anyenv.bash
diff --git a/tools.d/asdf.bash b/deprecated.d/asdf.bash
similarity index 100%
rename from tools.d/asdf.bash
rename to deprecated.d/asdf.bash
diff --git a/tools.d/powerline.bash b/deprecated.d/powerline.bash
similarity index 100%
rename from tools.d/powerline.bash
rename to deprecated.d/powerline.bash
diff --git a/tools.d/nix.bash b/optional.d/nix.bash
similarity index 100%
rename from tools.d/nix.bash
rename to optional.d/nix.bash
diff --git a/os.d/ubuntu.bash b/os.d/ubuntu.bash
index 561126f..e68cfbe 100644
--- a/os.d/ubuntu.bash
+++ b/os.d/ubuntu.bash
@@ -1,14 +1,15 @@
 #!/bin/bash
 
-if (grep -q Ubuntu <(lsb_release -i)); then
+if (grep -q Ubuntu <(lsb_release --id --short)); then
     sudo apt update
     sudo apt upgrade -y
 
-    sudo apt install -y coreutils grep less tar tree
+    sudo apt install -y coreutils grep less tar zip unzip tree
     sudo apt install -y man manpages-fr manpages-fr-extra
     sudo apt install -y bash zsh fish
     sudo apt install -y screen tmux
-    sudo apt install -y openssh mosh
-    sudo apt install -y vim git #tig
+    sudo apt install -y git #tig
+    sudo apt install -y vim
+    sudo apt install -y openssh-server openssh-client mosh
     sudo apt install -y wget curl lftp fping mtr socat
 fi
diff --git a/tools.d/mise.bash b/tools.d/mise.bash
index 0cc7b91..c65a3ed 100644
--- a/tools.d/mise.bash
+++ b/tools.d/mise.bash
@@ -2,17 +2,20 @@
 
 # mise-en-place (https://mise.jdx.dev/)
 
-# Install
+# Install mise
 
 if (! command -v mise &>/dev/null); then
 	curl https://mise.run | sh
 fi
 
-if (command -v mise &>/dev/null); then
-	# Activate
-	eval "$(mise activate bash)"
-	mise settings set experimental true
-	# Install some plugins
-	(mise where usage &>/dev/null) || mise use -g usage # for completion
-	# mise use -g cargo:ubi # to install binaries from Github release
-fi
+# Activate mise
+
+test -x ~/.local/bin/mise && eval "$(~/.local/bin/mise activate bash)"
+
+# Configure mise
+#
+mise settings set experimental true
+
+# Install some essential tools
+(mise where usage &>/dev/null) || mise use -g usage     # for completion
+(mise where chezmoi &>/dev/null) || mise use -g chezmoi # to manage dotfiles