diff --git a/main.yml b/main.yml
index 955fd60..6c37399 100644
--- a/main.yml
+++ b/main.yml
@@ -3,7 +3,7 @@
   hosts: all
   become: yes
   roles:
-    - packages
+    - base
     - net-security
   tags: base
 
diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml
new file mode 100644
index 0000000..0d0f7ef
--- /dev/null
+++ b/roles/base/tasks/main.yml
@@ -0,0 +1,25 @@
+- name: Install packages
+  apt:
+    name:
+      # Needed for handling GPG keys for repositories
+      - debian-keyring
+      - debian-archive-keyring
+      - apt-transport-https
+
+      # Easy to edit files
+      - vim
+      - tmux
+    state: present
+
+- name: Install Vim config
+  get_url:
+    url: 'https://r8r.be/vim'
+    dest: '{{ item.dest }}'
+    owner: "{{ item.user }}"
+    group: "{{ item.user }}"
+    mode: '644'
+  with_items:
+    - user: debian
+      dest: "/home/debian/.vimrc"
+    - user: root
+      dest: "/root/.vimrc"
diff --git a/roles/packages/tasks/main.yml b/roles/packages/tasks/main.yml
deleted file mode 100644
index 612137b..0000000
--- a/roles/packages/tasks/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: Install packages
-  apt:
-    name:
-      # Needed for handling GPG keys for repositories
-      - debian-keyring
-      - debian-archive-keyring
-      - apt-transport-https
-
-      # Easy to edit files
-      - vim
-    state: present