diff --git a/inventory.yaml b/inventory.yaml
index 03a6275..e25c97c 100644
--- a/inventory.yaml
+++ b/inventory.yaml
@@ -18,6 +18,67 @@ interface:
       - noto-fonts-ttf
       - noto-fonts-cjk
       - noto-fonts-emoji
+    packages_terminal:
+      - abduco
+      - atuin
+      - autofs
+      - bat
+      - bc
+      - bottom
+      - brightnessctl
+      - chafa
+      - docker
+      - docker-compose
+      - docx2txt
+      - duf
+      - dust
+      - entr
+      - eza
+      - fd
+      - flavours
+      - fwupd
+      - gallery-dl
+      - git-lfs
+      - htop
+      - iftop
+      - jrnl
+      - khal
+      - khard
+      - moreutils
+      - msmtp
+      - neomutt
+      - neovim
+      - newsboat
+      - nushell
+      - papis
+      - pass
+      - pdftk
+      - podman
+      - restic
+      - ripgrep
+      - sc-im
+      - starship
+      - swaybg
+      - swayidle
+      - task
+      - tasksh
+      - tectonic
+      - thermald
+      - timewarrior
+      - topgrade
+      - uv
+      - vdirsyncer
+      - vifm
+      - visidata
+      - wezterm
+      - wlopm
+      - wlsunset
+      - wtype
+      - yt-dlp
+      - zk
+      - zoxide
+      - zr # zsh plugin manager
+      - zsh
     packages_de:
       - bemenu
       - pinentry-bemenu
@@ -27,3 +88,8 @@ interface:
       - mako
       - slurp
       - waylock
+    packages_gui:
+      - gimp
+      - qutebrowser
+      - sioyek
+      - wdisplays
diff --git a/void_packages.yaml b/void_packages.yaml
index 3e862e6..507e94b 100644
--- a/void_packages.yaml
+++ b/void_packages.yaml
@@ -1,5 +1,5 @@
-- name: Install void customizations
-  hosts: void
+- name: Install basic custom void packages
+  hosts: interface
   become: true
   tags: interface
   vars:
@@ -12,24 +12,12 @@
         state: present
       notify: installed-keyd
 
-    - name: Install river wm
-      community.general.xbps:
-        name:
-          - river
-          - waybar
-        state: present
-
     - name: Install many fonts
       community.general.xbps:
         state: present
         name: "{{ packages_fonts }}"
       notify: installed-fonts
 
-    - name: Install base custom stuff
-      community.general.xbps:
-        name: "{{ packages_de }}"
-        state: present
-
   handlers:
     - name: Activate keyd service
       ansible.builtin.file:
@@ -47,3 +35,16 @@
           - --force
           - fontconfig
       listen: installed-fonts
+
+- name: Install basic custom void packages
+  hosts: chroot
+  become: true
+  tags:
+    - packages
+  vars:
+    ansible_chroot_exe: arch-chroot
+  tasks:
+    - name: Install a bunch of base custom stuff
+      community.general.xbps:
+        name: "{{ lookup('community.general.merge_variables', '^packages_.*') }}"
+        state: present