diff --git a/ansible/roles/emacs/files/elisp/lang-xml.el b/ansible/roles/emacs/files/elisp/lang-xml.el
new file mode 100644
index 0000000..5f7c12e
--- /dev/null
+++ b/ansible/roles/emacs/files/elisp/lang-xml.el
@@ -0,0 +1,17 @@
+(defun xml-fmt ()
+  "Run xmllint --format."
+  (run-command-on-buffer "xmllint" "--format" "-")
+  )
+
+(use-package nxml-mode
+  :commands (nxml-mode)
+  :pin manual
+  :ensure nil
+  :hook (
+         (nxml-mode . (lambda ()
+                        (add-hook 'before-save-hook 'xml-fmt nil 'local)
+                        ))
+         )
+  )
+
+(provide 'lang-xml)
diff --git a/ansible/roles/emacs/files/init.el b/ansible/roles/emacs/files/init.el
index 2eafda9..0d5391c 100644
--- a/ansible/roles/emacs/files/init.el
+++ b/ansible/roles/emacs/files/init.el
@@ -34,4 +34,6 @@
 
 (require 'lang-c)
 
+(require 'lang-xml)
+
 (load-directory autoload-directory)
diff --git a/ansible/roles/vscode/files/settings.json b/ansible/roles/vscode/files/settings.json
index 1aa636e..1ef45d8 100644
--- a/ansible/roles/vscode/files/settings.json
+++ b/ansible/roles/vscode/files/settings.json
@@ -32,5 +32,6 @@
     "editor.formatOnSave": true
   },
   "black-formatter.importStrategy": "fromEnvironment",
-  "workbench.statusBar.visible": false
+  "workbench.statusBar.visible": false,
+  "git.openRepositoryInParentFolders": "never"
 }