diff --git a/roles/openbsd/tasks/packages-cli.yml b/roles/openbsd/tasks/packages-cli.yml
index b1ab546..bb58139 100644
--- a/roles/openbsd/tasks/packages-cli.yml
+++ b/roles/openbsd/tasks/packages-cli.yml
@@ -23,3 +23,6 @@
       - ansible
       - git
       - mc
+      - neovim--
+      - nmap
+      - vim--no_x11
diff --git a/roles/openbsd/tasks/packages-gui.yml b/roles/openbsd/tasks/packages-gui.yml
index eb408ce..a9d8acb 100644
--- a/roles/openbsd/tasks/packages-gui.yml
+++ b/roles/openbsd/tasks/packages-gui.yml
@@ -23,6 +23,3 @@
       - firefox
       - icewm
       - keepassxc--
-      - noto-fonts
-      - rxvt-unicode--
-      - vim--no_x11