From c2c6f53075da4da4b9871fd28460dbcd77730b6b Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Thu, 13 Feb 2025 21:11:15 +0100
Subject: [PATCH] Remove docker rootless setup

---
 tasks/aur.yml      |  8 ------
 tasks/docker.yml   | 68 +++++++++++++++++++++++++++++++---------------
 vars/archlinux.yml |  8 +-----
 3 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/tasks/aur.yml b/tasks/aur.yml
index 6dd8c75..0ae28e6 100644
--- a/tasks/aur.yml
+++ b/tasks/aur.yml
@@ -24,11 +24,3 @@
 - name: build & install aur packages
   include_tasks: 'tasks/aur-package.yml'
   loop: '{{ aur_packages }}'
-
-- name: enable docker socket
-  systemd:
-    name: docker.socket
-    state: restarted
-    enabled: true
-    scope: user
-    daemon_reload: true
diff --git a/tasks/docker.yml b/tasks/docker.yml
index c0b35ca..2f0c938 100644
--- a/tasks/docker.yml
+++ b/tasks/docker.yml
@@ -1,39 +1,63 @@
-- name: copy docker mapping files
+- name: Remove docker mapping files
   become: true
-  template:
-    src: '{{ item.src }}'
-    dest: '{{ item.dest }}'
+  ansible.builtin.file:
+    path: '{{ item }}'
+    state: absent
   loop:
-    - { src: 'templates/subgid.j2', dest: '/etc/subgid' }
-    - { src: 'templates/subuid.j2', dest: '/etc/subuid' }
+    - /etc/subgid
+    - /etc/subuid
 
-- name: setup desktop configuration
-  copy:
-    src: 'files/docker-daemon.json'
-    dest: '{{ xdg_config_dir }}/docker/daemon.json'
+- name: Setup desktop configuration
+  ansible.builtin.file:
+    path: 'files/docker-daemon.json'
+    dest: '/etc/docker/daemon.json'
+    mode: '0755'
   when: ansible_hostname == 'desktop'
 
-- name: check for .bashrc.override
-  stat:
+- name: Remove user setup desktop configuration
+  ansible.builtin.file:
+    path: '{{ xdg_config_dir }}/docker/daemon.json'
+    state: absent
+  when: ansible_hostname == 'desktop'
+
+- name: Check for .bashrc.override
+  ansible.builtin.stat:
     path: '{{ ansible_env.HOME }}/.bashrc.override'
   register: bashrc_override
 
-- name: create .bashrc.override
-  file:
+- name: Create .bashrc.override
+  ansible.builtin.file:
     path: '{{ ansible_env.HOME }}/.bashrc.override'
     state: touch
+    mode: '0755'
   when: not bashrc_override.stat.exists
 
-- name: ensure correct DOCKER_HOST is set
-  lineinfile:
+- name: Remove rootless DOCKER_HOST variable assignment
+  ansible.builtin.lineinfile:
     path: '{{ ansible_env.HOME }}/.bashrc.override'
     regexp: '^export DOCKER_HOST='
-    line: 'export DOCKER_HOST=unix:///run/user/{{ ansible_user_uid }}/docker.sock'
+    line: ''
 
-- name: enable docker socket
-  systemd:
-    name: docker.socket
-    state: restarted
-    enabled: true
+- name: Disable user docker socket
+  ansible.builtin.systemd:
+    name: '{{ item }}'
+    state: stopped
+    enabled: false
     scope: user
     daemon_reload: true
+  loop:
+    - docker.socket
+    - docker.service
+
+- name: Remove docker rootless package
+  become: true
+  ansible.builtin.package:
+    name: docker-rootless-extras
+    state: absent
+
+- name: Enable system docker socket
+  become: true
+  ansible.builtin.systemd:
+    name: docker.socket
+    state: started
+    enabled: true
diff --git a/vars/archlinux.yml b/vars/archlinux.yml
index 8361533..bd77dfc 100644
--- a/vars/archlinux.yml
+++ b/vars/archlinux.yml
@@ -11,6 +11,7 @@ packages:
   - npm
   - docker
   - docker-compose
+  - iptables-nft
   - fuse-overlayfs
   - ttf-ibm-plex
   - slirp4netns
@@ -19,13 +20,6 @@ packages:
   - uv
 
 aur_packages:
-  - {
-      url: 'https://aur.archlinux.org/docker-rootless-extras.git',
-      name: 'docker-rootless',
-      package_name: 'docker-rootless-extras',
-      version: '27.1.2-1',
-      arch: 'x86_64',
-    }
   - {
       url: 'https://aur.archlinux.org/nvm.git',
       name: 'nvm',