diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index bd96b96..ba27141 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -51,9 +51,3 @@
     type: collection
     name: "{{ item }}"
   loop: "{{ ansible_galaxy_collections }}"
-
-- name: start/enable docker daemon
-  systemd:
-    name: docker.service
-    state: started
-    enabled: true
diff --git a/roles/base/vars/main.yml b/roles/base/vars/main.yml
index a7d6a58..38df149 100644
--- a/roles/base/vars/main.yml
+++ b/roles/base/vars/main.yml
@@ -22,6 +22,7 @@ create_directories:
   - code/scripts
   - code/projects
   - code/ansible
+  - code/repos
 
 init_users:
   opal:
diff --git a/roles/flatpak/vars/main.yml b/roles/flatpak/vars/main.yml
index 8988094..ea4d9ce 100644
--- a/roles/flatpak/vars/main.yml
+++ b/roles/flatpak/vars/main.yml
@@ -4,3 +4,4 @@ flatpak_packages:
   - org.libreoffice.LibreOffice
   - com.calibre_ebook.calibre 
   - net.ankiweb.Anki
+  - net.lutris.Lutris
diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml
index 3279176..76db775 100644
--- a/roles/packages/tasks/main.yml
+++ b/roles/packages/tasks/main.yml
@@ -39,3 +39,9 @@
     name: "{{ item }}"
     state: present
   loop: "{{ font_packages }}"
+
+- name: install pip packages
+  pip:
+    name: "{{ item }}"
+    state: present
+  loop: "{{ pip_packages }}"
diff --git a/roles/packages/vars/main.yml b/roles/packages/vars/main.yml
index b56b7d7..89f193d 100644
--- a/roles/packages/vars/main.yml
+++ b/roles/packages/vars/main.yml
@@ -11,7 +11,7 @@ wm_packages:
   - light
 
 cli_packages:
-  - alacritty
+  - man
   - keychain
   - python-pip
   - ripgrep
@@ -32,6 +32,8 @@ cli_packages:
   - bash-completion
   - beets
   - lf
+  - rsync
+  - p7zip
 
 general_packages:
   - firefox
@@ -56,6 +58,12 @@ general_packages:
   - bluez
   - bluez-utils
   - docker
+  - flatpak
+  - xorg-xwayland
+  - hugo
+  - alacritty
+  - easyeffects
+  - lsp-plugins
 
 networking_packages:
   - nmap
@@ -63,6 +71,7 @@ networking_packages:
   - network-manager-applet
   - nm-connection-editor
   - wireguard-tools
+  - bind
 
 doom_dep_packages:
   - python-pyflakes
@@ -79,8 +88,5 @@ font_packages:
   - noto-fonts-cjk
   - ttf-iosevka-nerd
 
-# TODO: Get Yay working
-yay_packages:
-  - grimshot
-  - wlsunset
-  - nerd-fonts-git
+pip_packages:
+  - trash-cli
diff --git a/roles/yay/tasks.yml b/roles/yay/tasks.yml
new file mode 100644
index 0000000..0553cec
--- /dev/null
+++ b/roles/yay/tasks.yml
@@ -0,0 +1,19 @@
+---
+- name: Clone yay
+  git:
+    repo: https://aur.archlinux.org/yay-bin.git
+    dest: "{{ srcdir }}/yay"
+    update: true
+
+- name: Build and install yay
+  command:
+    chdir: "{{ srcdir }}/yay"
+    cmd: "makepkg -sfi --noconfirm"
+    creates: /usr/bin/yay--
+
+- name: Install yay packages
+  community.general.pacman:
+    name: "{{ item }}"
+    state: present
+    executable: yay
+  loop: "{{ yay_packages }}"
diff --git a/roles/yay/vars.yml b/roles/yay/vars.yml
new file mode 100644
index 0000000..c6a3014
--- /dev/null
+++ b/roles/yay/vars.yml
@@ -0,0 +1,7 @@
+---
+homedir: "{{ lookup('env','HOME') }}"
+srcdir: "{{ homedir }}/code/repos/yay"
+
+yay_packages:
+  - grimshot
+  - wlsunset