diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
index 67f399b..71f2cb7 100644
--- a/roles/base/tasks/main.yml
+++ b/roles/base/tasks/main.yml
@@ -47,7 +47,3 @@
     group: "{{ item.value.group }}"
   loop: "{{ init_users | dict2items }}"
 
-- name: Setup /etc/motd from template
-  template:
-     src: motd.j2
-     dest: /etc/motd
diff --git a/roles/base/vars/main.yml b/roles/base/vars/main.yml
index 3caefc3..1b8baee 100644
--- a/roles/base/vars/main.yml
+++ b/roles/base/vars/main.yml
@@ -15,6 +15,7 @@ create_directories:
   - music
   - downloads
   - pictures
+  - share
   - code
   - code/scripts
   - code/projects
@@ -23,11 +24,10 @@ create_directories:
 init_users:
   opal:
     name: opal
-    uid: 2000
+    uid: 1000
     group: opal
     groups: 
       - wheel
-      - docker
     state: present
     shell: /bin/bash
     create_home: true
diff --git a/roles/git/tasks/main.yml b/roles/git/tasks/main.yml
index 6e9214c..f250dfd 100644
--- a/roles/git/tasks/main.yml
+++ b/roles/git/tasks/main.yml
@@ -11,14 +11,3 @@
     dest: "{{ cookbook_dest }}"
     update: no
 
-- name: Pull pfetch
-  git:
-    repo: "{{ pfetch_repo }}"
-    dest: "{{ pfetch_dest }}"
-    update: no
-
-- name: Pull Org Files
-  git:
-    repo: "{{ org_repo }}"
-    dest: "{{ org_dest }}"
-    update: no
diff --git a/roles/git/vars/.main.yml.swp b/roles/git/vars/.main.yml.swp
deleted file mode 100644
index e0ca0d5..0000000
Binary files a/roles/git/vars/.main.yml.swp and /dev/null differ
diff --git a/roles/git/vars/main.yml b/roles/git/vars/main.yml
index aa92f60..5bc5c27 100644
--- a/roles/git/vars/main.yml
+++ b/roles/git/vars/main.yml
@@ -7,18 +7,10 @@ cookbook_dest: /home/opal/projects/sysadmin-cookbook
 
 doom_emacs_repo: https://github.com/doomemacs/doomemacs 
 doom_emacs_dest: /home/opal/.config/emacs
-doom_emacs_install_cmd: /home/opal/.config/emacs/bin/doom -y install
-
-pfetch_repo: https://github.com/dylanaraps/pfetch
-pfetch_dest: /home/opal/bin/pfetch
-
-org_repo: git@codeberg.org:opalvaults/org-files.git
-org_dest: /home/opal/org
 
 init_users:
   opal:
     name: opal
-    uid: 2000
     group: opal
     groups: wheel
     state: present
diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml
index a5ff60b..a81cbaf 100644
--- a/roles/packages/tasks/main.yml
+++ b/roles/packages/tasks/main.yml
@@ -39,20 +39,3 @@
     name: "{{ item }}"
     state: present
   loop: "{{ font_packages }}"
-
-- name: install veracrypt from rpm
-  dnf:
-    name: "{{ veracrypt_url }}"
-    state: present
-    disable_gpg_check: True
-
-- name: install rpmfusion for ffmpeg
-  shell: 'sudo dnf install -y https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm'
-
-- name: install ffmpeg/libs
-  dnf:
-    name: "{{ item }}"
-    state: present
-  loop:
-    - ffmpeg
-    - ffmpeg-libs
diff --git a/roles/packages/vars/main.yml b/roles/packages/vars/main.yml
index 95b031b..006e8a6 100644
--- a/roles/packages/vars/main.yml
+++ b/roles/packages/vars/main.yml
@@ -17,42 +17,32 @@ cli_packages:
   - alacritty
   - keychain
   - python3-pip
-  - borgbackup
   - bat
-  - exa
-  - ripgrep
-  - stow
   - curl
   - make
-  - libtool
   - tldr
   - gnupg2
-  - vim
+  - neovim
   - trash-cli
   - lshw
   - git
-  - fd-find
-  - screen
   - htop
-  - duf
+  - p7zip
 
 general_packages:
-  - firefox
-  - qutebrowser
   - emacs
+  - beets
   - ansible
-  - syncthing
-  - udiskie
-  - transmission
-  - pavucontrol
-  - alsa-sof-firmware
-  - pipewire-pulseaudio
   - nicotine+
-  - papirus-icon-theme
-  - arc-theme
-  - python3-tldextract
-  - mpd
-  - ncmpcpp
+  - ffmpeg-free
+  - hugo
+  - easyeffects
+  - lsp-plugins
+  - newsboat
+  - udiskie
+  - transmission-qt
+  - pavucontrol
+  - pipewire-pulseaudio
   - remove-retired-packages
 
 networking_packages:
@@ -80,15 +70,9 @@ doom_dep_packages:
   - python3-nose2
   - python3-nose
   - python3-pytest
-  - npm
-  - shfmt
   - python3-lsp-black
 
 font_packages:
   - fontawesome5-fonts
   - abattis-cantarell-fonts
   - google-noto-cjk-fonts
-
-veracrypt_url: https://launchpad.net/veracrypt/trunk/1.25.9/+download/veracrypt-1.25.9-CentOS-8-x86_64.rpm
-
-fedora_ver: 36
diff --git a/roles/pip/tasks/main.yml b/roles/pip/tasks/main.yml
deleted file mode 100644
index 871c190..0000000
--- a/roles/pip/tasks/main.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- name: Install pip3 packages
-  pip:
-    name: "{{ item }}"
-    state: present
-  loop: "{{ pip_packages }}"
diff --git a/roles/pip/vars/main.yml b/roles/pip/vars/main.yml
deleted file mode 100644
index 259e6cf..0000000
--- a/roles/pip/vars/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-pip_packages:
-  - borgmatic
-  - keep
-  - beets
diff --git a/site.yml b/site.yml
index f437d90..e721727 100644
--- a/site.yml
+++ b/site.yml
@@ -13,12 +13,3 @@
       become: yes
       become_user: opal
       become_method: su
-
-    - role: pip
-      tags: pip_tag
-      become: yes
-      become_user: opal
-      become_method: su
-
-    - role: copr
-      tags: copr_tag