diff --git a/roles/workstation/.travis.yml b/roles/workstation/.travis.yml
new file mode 100644
index 0000000..36bbf62
--- /dev/null
+++ b/roles/workstation/.travis.yml
@@ -0,0 +1,29 @@
+---
+language: python
+python: "2.7"
+
+# Use the new container infrastructure
+sudo: false
+
+# Install ansible
+addons:
+  apt:
+    packages:
+    - python-pip
+
+install:
+  # Install ansible
+  - pip install ansible
+
+  # Check ansible version
+  - ansible --version
+
+  # Create ansible.cfg with correct roles_path
+  - printf '[defaults]\nroles_path=../' >ansible.cfg
+
+script:
+  # Basic role syntax check
+  - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
+
+notifications:
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/
\ No newline at end of file
diff --git a/roles/workstation/.yamllint b/roles/workstation/.yamllint
new file mode 100644
index 0000000..8827676
--- /dev/null
+++ b/roles/workstation/.yamllint
@@ -0,0 +1,33 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  colons:
+    max-spaces-after: -1
+    level: error
+  commas:
+    max-spaces-after: -1
+    level: error
+  comments: disable
+  comments-indentation: disable
+  document-start: disable
+  empty-lines:
+    max: 3
+    level: error
+  hyphens:
+    level: error
+  indentation: disable
+  key-duplicates: enable
+  line-length: disable
+  new-line-at-end-of-file: disable
+  new-lines:
+    type: unix
+  trailing-spaces: disable
+  truthy: disable
diff --git a/roles/workstation/README.md b/roles/workstation/README.md
new file mode 100644
index 0000000..225dd44
--- /dev/null
+++ b/roles/workstation/README.md
@@ -0,0 +1,38 @@
+Role Name
+=========
+
+A brief description of the role goes here.
+
+Requirements
+------------
+
+Any pre-requisites that may not be covered by Ansible itself or the role should be mentioned here. For instance, if the role uses the EC2 module, it may be a good idea to mention in this section that the boto package is required.
+
+Role Variables
+--------------
+
+A description of the settable variables for this role should go here, including any variables that are in defaults/main.yml, vars/main.yml, and any variables that can/should be set via parameters to the role. Any variables that are read from other roles and/or the global scope (ie. hostvars, group vars, etc.) should be mentioned here as well.
+
+Dependencies
+------------
+
+A list of other roles hosted on Galaxy should go here, plus any details in regards to parameters that may need to be set for other roles, or variables that are used from other roles.
+
+Example Playbook
+----------------
+
+Including an example of how to use your role (for instance, with variables passed in as parameters) is always nice for users too:
+
+    - hosts: servers
+      roles:
+         - { role: username.rolename, x: 42 }
+
+License
+-------
+
+BSD
+
+Author Information
+------------------
+
+An optional section for the role authors to include contact information, or a website (HTML is not allowed).
diff --git a/roles/workstation/defaults/main.yml b/roles/workstation/defaults/main.yml
new file mode 100644
index 0000000..fa8b8a6
--- /dev/null
+++ b/roles/workstation/defaults/main.yml
@@ -0,0 +1,124 @@
+---
+# defaults file for workstation
+pacman_utils:
+  - nfs-utils
+  - samba
+  - git-annex
+  - fzf
+  - ripgrep
+  - tig
+  - cups
+  - cups-pdf
+  - avahi
+  - mdns_minimal
+
+pacman_cli:
+  - moc
+  - pass
+  - task
+  - neomutt
+  - youtube-dl
+  - neovim
+  - python-pynvim
+
+pacman_terms: 
+  - rxvt-unicode
+  - xdotool
+  - alacritty
+
+pacman_office:
+  - gimp
+  - firefox
+  - firefox-i18n-fr
+  - chromium
+  - inkscape
+  - pstoedit # Enable latex in inkscape
+  - thunderbird
+  - thunderbird-i18n-fr
+  - libreoffice-fresh
+  - libreoffice-fresh-fr
+  - geogebra
+  - zathura
+  - zathura-ps
+  - zathura-djvu
+  - zathura-cb
+  - zathura-pdf-mupdf
+  - scribus
+  - nextcloud-client
+  - hunspell
+  - hunspell-fr
+
+pacman_work:
+  - texlive-most
+  - gnuplot
+  - auto-multiple-choice
+  - xournalpp
+
+pacman_media:
+  - vlc
+  - mpv
+  - mplayer
+  - guvcview
+
+pacman_3Dprint:
+  - openscad
+  - cura
+
+pacman_fonts:
+  - awesome-terminal-fonts
+  - cantarell-fonts
+  - gnu-free-fonts
+  - gsfonts
+  - ttf-bitstream-vera
+  - ttf-dejavu
+  - ttf-droid
+  - ttf-roboto
+  - ttf-liberation
+  - ttf-ubuntu-font-family
+  - ttf-inconsolata
+  - noto-fonts
+
+pacman_gnome:
+  - gnome
+  - gdm
+  - gnome-tweaks
+  - gparted
+  - transmission-gtk
+  - quodlibet
+  - networkmanager
+  - network-manager-applet
+  - gnome-keyring
+  - grsync
+  - soundconverter
+  - picard
+  - shotwell
+  - pitivi
+  - seahorse
+  - python-psutil
+
+pacman_pkgs:
+  - "{{ pacman_utils }}"
+  - "{{ pacman_cli }}"
+  - "{{ pacman_terms }}"
+  - "{{ pacman_office }}"
+  - "{{ pacman_media }}"
+  - "{{ pacman_work }}"
+  - "{{ pacman_3Dprint }}"
+  - "{{ pacman_fonts }}"
+
+
+aur_fonts: - ttf-ubuntu-mono-derivative-powerline-git
+  - ttf-inconsolata-lgc-for-powerline
+  - ttf-droid-sans-mono-slashed-powerline-git
+  - ttf-literation-mono-powerline-git
+  - ttf-opendyslexic
+  - nerd-fonts-ubuntu-mono
+  - nerd-fonts-droid-sans-mono
+  - nerd-fonts-hack
+
+aur_work:
+  - perl-locale-codes
+
+aur_pkgs:
+  - "{{ aur_fonts }}"
+  - "{{ aur_work }}"
diff --git a/roles/workstation/handlers/main.yml b/roles/workstation/handlers/main.yml
new file mode 100644
index 0000000..446a456
--- /dev/null
+++ b/roles/workstation/handlers/main.yml
@@ -0,0 +1,2 @@
+---
+# handlers file for workstation
diff --git a/roles/workstation/meta/main.yml b/roles/workstation/meta/main.yml
new file mode 100644
index 0000000..c572acc
--- /dev/null
+++ b/roles/workstation/meta/main.yml
@@ -0,0 +1,52 @@
+galaxy_info:
+  author: your name
+  description: your role description
+  company: your company (optional)
+
+  # If the issue tracker for your role is not on github, uncomment the
+  # next line and provide a value
+  # issue_tracker_url: http://example.com/issue/tracker
+
+  # Choose a valid license ID from https://spdx.org - some suggested licenses:
+  # - BSD-3-Clause (default)
+  # - MIT
+  # - GPL-2.0-or-later
+  # - GPL-3.0-only
+  # - Apache-2.0
+  # - CC-BY-4.0
+  license: license (GPL-2.0-or-later, MIT, etc)
+
+  min_ansible_version: 2.1
+
+  # If this a Container Enabled role, provide the minimum Ansible Container version.
+  # min_ansible_container_version:
+
+  #
+  # Provide a list of supported platforms, and for each platform a list of versions.
+  # If you don't wish to enumerate all versions for a particular platform, use 'all'.
+  # To view available platforms and versions (or releases), visit:
+  # https://galaxy.ansible.com/api/v1/platforms/
+  #
+  # platforms:
+  # - name: Fedora
+  #   versions:
+  #   - all
+  #   - 25
+  # - name: SomePlatform
+  #   versions:
+  #   - all
+  #   - 1.0
+  #   - 7
+  #   - 99.99
+
+  galaxy_tags: []
+    # List tags for your role here, one per line. A tag is a keyword that describes
+    # and categorizes the role. Users find roles by searching for tags. Be sure to
+    # remove the '[]' above, if you add tags to this list.
+    #
+    # NOTE: A tag is limited to a single word comprised of alphanumeric characters.
+    #       Maximum 20 tags per role.
+
+dependencies: []
+  # List your role dependencies here, one per line. Be sure to remove the '[]' above,
+  # if you add dependencies to this list.
diff --git a/roles/workstation/molecule/default/INSTALL.rst b/roles/workstation/molecule/default/INSTALL.rst
new file mode 100644
index 0000000..0c4bf5c
--- /dev/null
+++ b/roles/workstation/molecule/default/INSTALL.rst
@@ -0,0 +1,23 @@
+*********************************
+Vagrant driver installation guide
+*********************************
+
+Requirements
+============
+
+* Vagrant
+* Virtualbox, Parallels, VMware Fusion, VMware Workstation or VMware Desktop
+
+Install
+=======
+
+Please refer to the `Virtual environment`_ documentation for installation best
+practices. If not using a virtual environment, please consider passing the
+widely recommended `'--user' flag`_ when invoking ``pip``.
+
+.. _Virtual environment: https://virtualenv.pypa.io/en/latest/
+.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site
+
+.. code-block:: bash
+
+    $ pip install 'molecule_vagrant'
diff --git a/roles/workstation/molecule/default/converge.yml b/roles/workstation/molecule/default/converge.yml
new file mode 100644
index 0000000..03dfbef
--- /dev/null
+++ b/roles/workstation/molecule/default/converge.yml
@@ -0,0 +1,7 @@
+---
+- name: Converge
+  hosts: all
+  tasks:
+    - name: "Include workstation"
+      include_role:
+        name: "workstation"
diff --git a/roles/workstation/molecule/default/molecule.yml b/roles/workstation/molecule/default/molecule.yml
new file mode 100644
index 0000000..748eb79
--- /dev/null
+++ b/roles/workstation/molecule/default/molecule.yml
@@ -0,0 +1,11 @@
+---
+dependency:
+  name: galaxy
+driver:
+  name: vagrant
+platforms:
+  - name: instance
+provisioner:
+  name: ansible
+verifier:
+  name: testinfra
diff --git a/roles/workstation/molecule/default/tests/conftest.py b/roles/workstation/molecule/default/tests/conftest.py
new file mode 100644
index 0000000..f7ddb3f
--- /dev/null
+++ b/roles/workstation/molecule/default/tests/conftest.py
@@ -0,0 +1,22 @@
+"""PyTest Fixtures."""
+from __future__ import absolute_import
+
+import os
+
+import pytest
+
+
+def pytest_runtest_setup(item):
+    """Run tests only when under molecule with testinfra installed."""
+    try:
+        import testinfra
+    except ImportError:
+        pytest.skip("Test requires testinfra", allow_module_level=True)
+    if "MOLECULE_INVENTORY_FILE" in os.environ:
+        pytest.testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
+            os.environ["MOLECULE_INVENTORY_FILE"]
+        ).get_hosts("all")
+    else:
+        pytest.skip(
+            "Test should run only from inside molecule.", allow_module_level=True
+        )
diff --git a/roles/workstation/molecule/default/tests/test_default.py b/roles/workstation/molecule/default/tests/test_default.py
new file mode 100644
index 0000000..0cff669
--- /dev/null
+++ b/roles/workstation/molecule/default/tests/test_default.py
@@ -0,0 +1,10 @@
+"""Role testing files using testinfra."""
+
+
+def test_hosts_file(host):
+    """Validate /etc/hosts file."""
+    f = host.file("/etc/hosts")
+
+    assert f.exists
+    assert f.user == "root"
+    assert f.group == "root"
diff --git a/roles/workstation/tasks/arch.yml b/roles/workstation/tasks/arch.yml
new file mode 100644
index 0000000..7b0094a
--- /dev/null
+++ b/roles/workstation/tasks/arch.yml
@@ -0,0 +1,43 @@
+---
+# tasks file for workstation
+- name: More colorfull pacman
+  lineinfile:
+    dest: /etc/pacman.conf
+    regexp: '^#Color$'
+    line: 'Color'
+    backrefs: yes
+  ignore_errors: yes
+
+- name: Install pkgs
+  community.general.pacman:
+    name: "{{ item }}"
+    state: present
+  with_items: pacman_pkgs
+
+- name: Install AUR pkgs
+  kewlfft.aur.aur:
+    name: "{{ item }}"
+    state: present
+  with_items: aur_pkgs
+
+- name: enable service cups
+  systemd:
+    name: cups
+    # name: org.cups.cups
+    enabled: yes
+    state: started
+  when: not minimal or not server
+
+- name: enable service avahi-daemon
+  systemd:
+    name: avahi-daemon
+    enabled: yes
+    state: started
+  when: not minimal or not server
+
+- name: enable service nfs
+  systemd:
+    name: nfs-client.target
+    enabled: yes
+    state: started
+  when: not minimal or not server
diff --git a/roles/workstation/tasks/main.yml b/roles/workstation/tasks/main.yml
new file mode 100644
index 0000000..817c531
--- /dev/null
+++ b/roles/workstation/tasks/main.yml
@@ -0,0 +1,38 @@
+---
+# tasks file for workstation
+- name: Install for arch
+  import_tasks: arch.yml
+  when: ansible_os_family == "Archlinux"
+
+- name: enable service cups
+  systemd:
+    name: cups
+    # name: org.cups.cups
+    enabled: yes
+    state: started
+
+- name: Set hostname resolution
+  ansible.builtin.lineinfile:
+    path: /etc/nsswitch.conf
+    regexp: "^hosts:"
+    line: hosts: files mymachines myhostname mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] dns
+      
+- name: enable service avahi-daemon
+  systemd:
+    name: avahi-daemon
+    enabled: yes
+    state: started
+
+- name: enable service nfs
+  systemd:
+    name: nfs-client.target
+    enabled: yes
+    state: started
+
+- name: More colorfull pacman
+  lineinfile:
+    dest: /etc/pacman.conf
+    regexp: '^#Color$'
+    line: 'Color'
+    backrefs: yes
+  ignore_errors: yes
diff --git a/roles/workstation/tests/inventory b/roles/workstation/tests/inventory
new file mode 100644
index 0000000..878877b
--- /dev/null
+++ b/roles/workstation/tests/inventory
@@ -0,0 +1,2 @@
+localhost
+
diff --git a/roles/workstation/tests/test.yml b/roles/workstation/tests/test.yml
new file mode 100644
index 0000000..b5a75dd
--- /dev/null
+++ b/roles/workstation/tests/test.yml
@@ -0,0 +1,5 @@
+---
+- hosts: localhost
+  remote_user: root
+  roles:
+    - workstation
diff --git a/roles/workstation/vars/main.yml b/roles/workstation/vars/main.yml
new file mode 100644
index 0000000..5403157
--- /dev/null
+++ b/roles/workstation/vars/main.yml
@@ -0,0 +1,2 @@
+---
+# vars file for workstation