diff --git a/roles/arch/defaults/main.yml b/roles/arch/defaults/main.yml
index b8f7564..d594e87 100644
--- a/roles/arch/defaults/main.yml
+++ b/roles/arch/defaults/main.yml
@@ -22,7 +22,7 @@ packages:
   - curl
   - cantata
   - reflector
+  - laptop-detect
 
-platform: "desktop"
 platform_packages: []
 skip_common_setup: true
diff --git a/roles/arch/tasks/main.yml b/roles/arch/tasks/main.yml
index 89875bf..72a56de 100644
--- a/roles/arch/tasks/main.yml
+++ b/roles/arch/tasks/main.yml
@@ -1,30 +1,18 @@
-- name: load desktop specific vars
-  include_vars: desktop.yml
-  when: platform == "desktop"
-
-- name: load laptop specific vars
-  include_vars: laptop.yml
-  when: platform == "laptop"
-
 - name: install shared packages
   become: yes
   pacman:
     name: "{{ packages }}"
 
+- name: detecting platform
+  include_tasks: platform.yml
+
 - name: install platform specific packages
   become: yes
   pacman:
     name: "{{ platform_packages }}"
 
-- name: copy firewall template
-  become: yes
-  template:
-    src: "{{ platform }}/nftables.j2"
-    dest: "/etc/nftables.conf"
-    owner: root
-    group: root
-    mode: "0600"
-  notify: restart nftables
+- name: configuring network
+  include_tasks: network.yml
 
 - name: copy reflector configuration
   become: yes
@@ -40,7 +28,6 @@
 # - pacman setup depending on platform (see include section for common options)
 # - laptop power saving configuration
 
-- include_tasks: network.yml
 - include_tasks: mpv.yml # TODO
 - include_tasks: mpd.yml # TODO
 - include_tasks: nfs.yml # TODO
diff --git a/roles/arch/tasks/network.yml b/roles/arch/tasks/network.yml
index e0804ab..5df08ff 100644
--- a/roles/arch/tasks/network.yml
+++ b/roles/arch/tasks/network.yml
@@ -34,3 +34,13 @@
     state: started
     enabled: yes
   when: platform == "laptop"
+
+- name: copy firewall template
+  become: yes
+  template:
+    src: "{{ platform }}/nftables.j2"
+    dest: "/etc/nftables.conf"
+    owner: root
+    group: root
+    mode: "0600"
+  notify: restart nftables
diff --git a/roles/arch/tasks/platform.yml b/roles/arch/tasks/platform.yml
new file mode 100644
index 0000000..c9a7dd2
--- /dev/null
+++ b/roles/arch/tasks/platform.yml
@@ -0,0 +1,22 @@
+- name: detect platform
+  command: laptop-detect
+  register: is_laptop
+  failed_when: is_laptop.rc == 2
+
+- name: set platform (desktop)
+  set_fact:
+    platform: "desktop"
+  when: is_laptop.rc == 1
+
+- name: set platform (laptop)
+  set_fact:
+    platform: "laptop"
+  when: is_laptop.rc == 0
+
+- name: load desktop specific vars
+  include_vars: desktop.yml
+  when: platform == "desktop"
+
+- name: load laptop specific vars
+  include_vars: laptop.yml
+  when: platform == "laptop"