From 333df38852f043930dab1531210984a5caba625d Mon Sep 17 00:00:00 2001
From: Sonny Bakker <sonny871@hotmail.com>
Date: Fri, 9 Jan 2026 20:52:12 +0100
Subject: [PATCH] Update desktop network configuration

---
 desktop.yml                               | 1 -
 host_vars/desktop/network.yml             | 1 +
 tasks/network/desktop.yml                 | 6 +++++-
 templates/desktop/network/mv-0.netdev.j2  | 8 ++++++++
 templates/desktop/network/mv-0.network.j2 | 8 ++++++++
 templates/htpc/network/enp1s0.network.j2  | 1 +
 6 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 templates/desktop/network/mv-0.netdev.j2
 create mode 100644 templates/desktop/network/mv-0.network.j2

diff --git a/desktop.yml b/desktop.yml
index a2f9da8..07832cf 100644
--- a/desktop.yml
+++ b/desktop.yml
@@ -24,7 +24,6 @@
       ansible.builtin.import_tasks: "tasks/syncthing.yml"
       tags: syncthing
 
-    # TODO: provision current macvlan setup
     - name: Desktop provisioning
       ansible.builtin.import_tasks: "tasks/desktop.yml"
       tags: desktop
diff --git a/host_vars/desktop/network.yml b/host_vars/desktop/network.yml
index 76275fa..f906953 100644
--- a/host_vars/desktop/network.yml
+++ b/host_vars/desktop/network.yml
@@ -1,6 +1,7 @@
 ---
 lan_interface: enp1s0
 lan_interface_mac: 00:d8:61:9f:52:65
+macvlan_interface: mv-0
 
 local_network_address: 192.168.2.15/24
 local_network_dns: 9.9.9.9 149.112.112.112
diff --git a/tasks/network/desktop.yml b/tasks/network/desktop.yml
index 0e40bec..12a97ac 100644
--- a/tasks/network/desktop.yml
+++ b/tasks/network/desktop.yml
@@ -15,8 +15,12 @@
       loop:
         - src: "templates/desktop/network/enp1s0.link.j2"
           dest: "/etc/systemd/network/20-enp1s0.link"
-        - src: "templates/desktop//network/enp1s0.network.j2"
+        - src: "templates/desktop/network/enp1s0.network.j2"
           dest: "/etc/systemd/network/20-enp1s0.network"
+        - src: "templates/desktop/network/mv-0.netdev.j2"
+          dest: "/etc/systemd/network/10-mv-0.netdev.j2"
+        - src: "templates/desktop/network/mv-0.network.j2"
+          dest: "/etc/systemd/network/30-mv-0.network.j2"
 
     - name: Remove leftover configuration files
       become: true
diff --git a/templates/desktop/network/mv-0.netdev.j2 b/templates/desktop/network/mv-0.netdev.j2
new file mode 100644
index 0000000..d933e28
--- /dev/null
+++ b/templates/desktop/network/mv-0.netdev.j2
@@ -0,0 +1,8 @@
+# {{ ansible_managed }}
+
+[NetDev]
+Name={{ macvlan_interface }}
+Kind=macvlan
+
+[MACVLAN]
+Mode=bridge
diff --git a/templates/desktop/network/mv-0.network.j2 b/templates/desktop/network/mv-0.network.j2
new file mode 100644
index 0000000..851f1d0
--- /dev/null
+++ b/templates/desktop/network/mv-0.network.j2
@@ -0,0 +1,8 @@
+# {{ ansible_managed }}
+
+[Match]
+Name={{ macvlan_interface }}
+
+[Network]
+DHCP=yes
+BindCarrier={{ lan_interface }}
diff --git a/templates/htpc/network/enp1s0.network.j2 b/templates/htpc/network/enp1s0.network.j2
index af57302..4c59786 100644
--- a/templates/htpc/network/enp1s0.network.j2
+++ b/templates/htpc/network/enp1s0.network.j2
@@ -15,3 +15,4 @@ LinkLocalAddressing=no
 IPv6AcceptRA=no
 IPv6SendRA=no
 RequiredForOnline=routable
+MACVLAN={{ macvlan_interface }}