diff --git a/roles/nvim/tasks/main.yml b/roles/nvim/tasks/main.yml
index 72cb6c6..5378990 100644
--- a/roles/nvim/tasks/main.yml
+++ b/roles/nvim/tasks/main.yml
@@ -17,6 +17,14 @@
     mode: '0755'
   tags: [always, setup]
 
+- name: Create symlink for vim to nvim
+  ansible.builtin.file:
+    src: /usr/bin/nvim
+    dest: /usr/local/bin/vim
+    state: link
+  become: true
+  tags: [always, setup]
+
 - name: Server specific nvim tasks
   tags: server
   block:
diff --git a/roles/xmonad/files/fonts.conf b/roles/xmonad/files/fonts.conf
new file mode 100644
index 0000000..53044e8
--- /dev/null
+++ b/roles/xmonad/files/fonts.conf
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">
+<fontconfig>
+
+  <alias>
+    <family>sans-serif</family>
+    <prefer>
+      <family>Liberation Sans</family>
+    </prefer>
+  </alias>
+
+  <alias>
+    <family>serif</family>
+    <prefer>
+      <family>Liberation Serif</family>
+    </prefer>
+  </alias>
+
+  <alias>
+    <family>monospace</family>
+    <prefer>
+      <family>Iosevka</family>
+    </prefer>
+  </alias>
+
+</fontconfig>
diff --git a/roles/xmonad/tasks/main.yml b/roles/xmonad/tasks/main.yml
index aef26e1..8a00c0f 100644
--- a/roles/xmonad/tasks/main.yml
+++ b/roles/xmonad/tasks/main.yml
@@ -23,10 +23,41 @@
       - zathura
       - zathura-pdf-mupdf
       - ttc-iosevka
+      - ttf-liberation
+      - imlib2
+      - libxext
+      - libxrandr
     state: present
   become: true
   tags: [pc, setup]
 
+- name: Install packages from AUR
+  tags: [pc, setup]
+  block:
+    - name: Enable user to use sudo pacman without password
+      become: true
+      ansible.builtin.lineinfile:
+        path: /etc/sudo.conf
+        line: 'max ALL=(ALL) NOPASSWD: /usr/bin/pacman'
+        state: present
+        validate: 'visudo -cf %s'
+
+    - name: Install language server from AUR
+      kewlfft.aur.aur:
+        use: paru
+        state: present
+        name:
+          - pmount
+          - advmvcp
+  always:
+    - name: Disable user to use sudo pacman without password
+      become: true
+      ansible.builtin.lineinfile:
+        path: /etc/sudo.conf
+        line: 'max ALL=(ALL) NOPASSWD: /usr/bin/pacman'
+        state: absent
+        validate: 'visudo -cf %s'
+
 - name: Install laptop specific packages
   ansible.builtin.package:
     name:
@@ -80,6 +111,8 @@
     - ~/.config/nsxiv/exec
     - ~/.config/zathura
     - ~/.config/feh
+    - ~/.config/nnn
+    - ~/.config/fontconfig
   tags: [pc, setup]
 
 - name: Copy over cmus config
@@ -90,13 +123,6 @@
   with_fileglob: "cmus/*"
   tags: pc
 
-- name: Create nnn config directory
-  ansible.builtin.file:
-    path: "~/.config/nnn"
-    state: directory
-    mode: '0755'
-  tags: [pc, setup]
-
 - name: Clone nnn repository into temp
   ansible.builtin.git:
     repo: https://github.com/jarun/nnn.git
@@ -125,6 +151,7 @@
     - { src: redshiftrc, dest: redshift/redshiftrc }
     - { src: zathurarc, dest: zathura/zathurarc }
     - { src: feh_keys, dest: feh/keys }
+    - { src: fonts.conf, dest: fontconfig/fonts.conf }
 
 - name: Copy over nsixv key handler script
   ansible.builtin.copy: