diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el
index 9d3cbcf..c028e52 100644
--- a/user/app/doom-emacs/config.el
+++ b/user/app/doom-emacs/config.el
@@ -1249,7 +1249,13 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (require 'all-the-icons-ibuffer)
 (add-hook 'ibuffer-mode-hook #'all-the-icons-ibuffer-mode)
 (setq all-the-icons-ibuffer-color-icon t)
-(evil-set-initial-state 'ibuffer-mode 'normal)
+(evil-set-initial-state 'ibuffer-mode 'motion)
+(evil-define-key 'motion 'ibuffer-mode
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "d" 'ibuffer-mark-for-delete
+  "q" 'kill-buffer
+  (kbd "<return>") 'ibuffer-visit-buffer)
 
 ;;;------ dired configuration ------;;;
 
@@ -1512,7 +1518,6 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (setq +format-on-save-enabled-modes '(not emacs-lisp-mode sql-mode tex-mode latex-mode org-msg-edit-mode nix-mode))
 
 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
-(add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers
 
 ;; I source my rss from my freshrss instance
 ;; I login with a private elisp file: ~/.emacs.d/freshrss-elfeed.el
diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org
index e47909b..c2670c0 100644
--- a/user/app/doom-emacs/doom.org
+++ b/user/app/doom-emacs/doom.org
@@ -1467,7 +1467,13 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)."
 (require 'all-the-icons-ibuffer)
 (add-hook 'ibuffer-mode-hook #'all-the-icons-ibuffer-mode)
 (setq all-the-icons-ibuffer-color-icon t)
-(evil-set-initial-state 'ibuffer-mode 'normal)
+(evil-set-initial-state 'ibuffer-mode 'motion)
+(evil-define-key 'motion 'ibuffer-mode
+  "j" 'evil-next-visual-line
+  "k" 'evil-previous-visual-line
+  "d" 'ibuffer-mark-for-delete
+  "q" 'kill-buffer
+  (kbd "<return>") 'ibuffer-visit-buffer)
 
 #+END_SRC
 ** Dired Configuration
@@ -1784,7 +1790,6 @@ I don't have this active right now since it's kinda weird with pgtk...
 ** Terminal
 #+BEGIN_SRC emacs-lisp :tangle config.el
 (add-to-list 'tramp-remote-path 'tramp-own-remote-path)
-(add-to-list 'vterm-tramp-shells '("ssh" "zsh")) ;; I use zsh on all my servers
 #+END_SRC
 ** Elfeed
 #+BEGIN_SRC emacs-lisp :tangle config.el