From 381052586d87abc891ef189ef8930daacf668760 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <beyerstedt@consider-it.de>
Date: Fri, 20 Mar 2026 12:13:50 +0100
Subject: [PATCH 1/5] vscode-settings: Update

---
 files/vscode-settings.json | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/files/vscode-settings.json b/files/vscode-settings.json
index 1774469..d13b06a 100644
--- a/files/vscode-settings.json
+++ b/files/vscode-settings.json
@@ -33,6 +33,15 @@
     "[cpp]": {
         "editor.defaultFormatter": "ms-vscode.cpptools"
     },
+    "[dockercompose]": {
+        "editor.insertSpaces": true,
+        "editor.tabSize": 2,
+        "editor.autoIndent": "advanced",
+        "editor.defaultFormatter": "redhat.vscode-yaml"
+    },
+    "[github-actions-workflow]": {
+        "editor.defaultFormatter": "redhat.vscode-yaml"
+    },
     "[html]": {
         "editor.formatOnSave": false
     },
@@ -175,5 +184,7 @@
     "python.analysis.aiHoverSummaries": false,
     "rust-analyzer.hover.memoryLayout.size": "both",
     "rust-analyzer.imports.granularity.enforce": true,
-    "yaml.format.printWidth": 110
+    "rust-analyzer.rustfmt.overrideCommand": null,
+    "yaml.format.printWidth": 110,
+    "xml.server.preferBinary": true
 }
\ No newline at end of file

From e23420162ef907a8632c538e0c7584e14182cbe6 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <beyerstedt@consider-it.de>
Date: Fri, 20 Mar 2026 12:16:24 +0100
Subject: [PATCH 2/5] devel-darwin: more fonts

---
 tasks/devel-Darwin.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tasks/devel-Darwin.yml b/tasks/devel-Darwin.yml
index a315680..b78d33f 100644
--- a/tasks/devel-Darwin.yml
+++ b/tasks/devel-Darwin.yml
@@ -3,8 +3,12 @@
 
 - name: Devel - Fonts
   community.general.homebrew:
-    name: font-hack
+    name: "{{ item }}"
     state: present
+  loop:
+    - font-hack
+    - font-overpass
+    - font-news-cycle
 
 # Install Visual Studio Code and Set Basic Configuration
 - name: VSCode - Basics

From b3fb9d82890e968c1828a8cc2c58246f11fa1c4d Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <beyerstedt@consider-it.de>
Date: Fri, 20 Mar 2026 12:17:21 +0100
Subject: [PATCH 3/5] devel-Darwin: Add more C/C++ tools, add clang-tidy to
 $PATH

---
 tasks/devel-Darwin.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/tasks/devel-Darwin.yml b/tasks/devel-Darwin.yml
index b78d33f..31c0a61 100644
--- a/tasks/devel-Darwin.yml
+++ b/tasks/devel-Darwin.yml
@@ -57,7 +57,16 @@
       vars:
         packages:
           - clang-format
+          - llvm
+          - cmake
+          - ninja
+          - meson
       diff: false
+    - name: Devel - C/C++ - Symlink clang-tidy
+      ansible.builtin.file:
+        state: link
+        path: /usr/local/bin/clang-tidy
+        src: /opt/homebrew/opt/llvm/bin/clang-tidy
 
 # Dev Env - Python Development Tools
 # all done in vscode.yml
@@ -85,6 +94,6 @@
         state: present
       vars:
         packages:
-          - basictex # neeeds sudo
+          - basictex # needs sudo
           - tex-live-utility
       diff: false

From 3a4f5d2d3aa8ac4a8f5d8c562a83aa651e278809 Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <beyerstedt@consider-it.de>
Date: Fri, 20 Mar 2026 12:17:39 +0100
Subject: [PATCH 4/5] devel: Fix autopep8 and pylint installations on macOS

---
 tasks/devel.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/tasks/devel.yml b/tasks/devel.yml
index a6fc5e3..75faadb 100644
--- a/tasks/devel.yml
+++ b/tasks/devel.yml
@@ -54,9 +54,16 @@
         code --install-extension ms-vscode.cmake-tools
 
 # VS Code - Python Development Tools
-- name: Devel - Python - Install python dev packages
+- name: Devel - Python - Install python dev packages (macOS)
   tags: lang_python
-  when: user_lang_python
+  when: user_lang_python and (override_os_family is defined) | ternary(override_os_family,ansible_facts['os_family']) == "Darwin"
+  ansible.builtin.homebrew:
+    name:
+      - autopep8
+      - pylint
+- name: Devel - Python - Install python dev packages (non macOS)
+  tags: lang_python
+  when: user_lang_python and not (override_os_family is defined) | ternary(override_os_family,ansible_facts['os_family']) == "Darwin"
   ansible.builtin.pip:
     name:
       - autopep8

From 114ae0892158826dddd528eb2318b7cb85e9bcfb Mon Sep 17 00:00:00 2001
From: Jannik Beyerstedt <beyerstedt@consider-it.de>
Date: Fri, 20 Mar 2026 12:22:43 +0100
Subject: [PATCH 5/5] zshrc: Fix position of homebrew/bin in $PATH

---
 templates/_zshrc.j2 | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/templates/_zshrc.j2 b/templates/_zshrc.j2
index 60aa775..f4d0802 100644
--- a/templates/_zshrc.j2
+++ b/templates/_zshrc.j2
@@ -1,4 +1,15 @@
 # Unified zshrc of Jannik Beyerstedt
+typeset -aU path
+{% if (override_os_family is defined) | ternary(override_os_family,ansible_facts['os_family']) == "Darwin" %}
+path=('/opt/homebrew/bin' $path)
+export PATH
+{% else %}
+# If you come from bash you might have to change your $PATH.
+# path=('$HOME/bin' $path)
+# path=('/usr/local/bin' $path)
+# export PATH
+{% endif %}
+
 export TERM=xterm-256color
 {% if usersetup_virtualenvwrapper|default(false)|bool %}
 VIRTUALENVWRAPPER_PYTHON=$(which python3)
@@ -7,9 +18,6 @@ VIRTUALENVWRAPPER_PYTHON=$(which python3)
 DEFAULT_USER="jannik"
 DISABLE_UPDATE_PROMPT=true
 
-# If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
-
 # Path to your oh-my-zsh installation.
 export ZSH=$HOME/.oh-my-zsh