From 18716e58ca42bc91f93aa7b17badc2aa6b904afd Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 6 Dec 2025 11:43:00 +0000
Subject: [PATCH 1/3] qenya/git: Update config key names

---
 home/qenya/git.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/home/qenya/git.nix b/home/qenya/git.nix
index 2101e64..7bec854 100644
--- a/home/qenya/git.nix
+++ b/home/qenya/git.nix
@@ -3,9 +3,9 @@
 {
   programs.git = {
     enable = true;
-    userName = "Katherina Walshe-Grey";
-    userEmail = "git@qenya.tel";
-    extraConfig = {
+    settings = {
+      user.email = "git@qenya.tel";
+      user.name = "Katherina Walshe-Grey";
       init.defaultBranch = "main";
       pull.rebase = true;
       push.autoSetupRemote = true;

From 31f1036c17712bead374f28e53ac893b0e0c5e04 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 6 Dec 2025 11:43:14 +0000
Subject: [PATCH 2/3] qenya/vscode: Install Ansible extension

---
 flake.nix             | 1 -
 home/qenya/vscode.nix | 9 +++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index b401d1c..7954bc9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,6 @@
             })
             inputs.agenix.packages.${system}.default
             inputs.plasma-manager.packages.${system}.rc2nix
-            pkgs.ansible
           ];
         };
       };
diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index 87c2dec..fce9173 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -13,6 +13,7 @@ in
       enableExtensionUpdateCheck = false;
       enableUpdateCheck = false;
       extensions = with pkgs.vscode-extensions; [
+        redhat.ansible
         ms-python.black-formatter
         ms-azuretools.vscode-docker
         mkhl.direnv
@@ -27,8 +28,15 @@ in
         shopify.ruby-lsp
         charliermarsh.ruff
         rust-lang.rust-analyzer
+        redhat.vscode-yaml
       ];
       userSettings = {
+        "ansible.ansible.path" = "${pkgs.ansible}/bin/ansible";
+        "ansible.validation.lint.enabled" = true;
+        "ansible.validation.lint.path" = "${pkgs.ansible-lint}/bin/ansible-lint";
+        "ansible.ansibleNavigator.path" = "${pkgs.ansible-navigator}/bin/ansible-navigator";
+        "ansible.python.interpreterPath" = "${pkgs.python3}/bin/python";
+        "ansible.lightspeed.enabled" = false;
         "css.format.spaceAroundSelectorSeparator" = true;
         "css.format.newlineBetweenSelectors" = false;
         "debug.allowBreakpointsEverywhere" = true;
@@ -47,6 +55,7 @@ in
           formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
           nix.flake.autoArchive = true;
         };
+        "redhat.telemetry.enabled" = false;
         "rust-analyzer.check.command" = "clippy";
         "terminal.integrated.allowChords" = false;
         "terminal.integrated.defaultProfile.linux" = "zsh";

From 33fae52e472ef5c4b8cf36a498796199d333aa01 Mon Sep 17 00:00:00 2001
From: Katherina Walshe-Grey <git@qenya.tel>
Date: Sat, 6 Dec 2025 14:01:08 +0000
Subject: [PATCH 3/3] qenya/vscode: Run Ansible inside a venv

---
 .gitignore            | 3 +++
 home/qenya/vscode.nix | 5 +----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2fda708..3863d20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,6 @@ result-*
 
 # ---> Ansible
 *.retry
+
+# https://github.com/ansible/ansible-lint/issues/4533
+.ansible/
diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index fce9173..bfbea1c 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -31,11 +31,8 @@ in
         redhat.vscode-yaml
       ];
       userSettings = {
-        "ansible.ansible.path" = "${pkgs.ansible}/bin/ansible";
         "ansible.validation.lint.enabled" = true;
-        "ansible.validation.lint.path" = "${pkgs.ansible-lint}/bin/ansible-lint";
-        "ansible.ansibleNavigator.path" = "${pkgs.ansible-navigator}/bin/ansible-navigator";
-        "ansible.python.interpreterPath" = "${pkgs.python3}/bin/python";
+        "ansible.python.interpreterPath" = "\${workspaceFolder}/.venv/bin/python"; # needs some manual one-time setup per repo, but it's better than fucking with FHS
         "ansible.lightspeed.enabled" = false;
         "css.format.spaceAroundSelectorSeparator" = true;
         "css.format.newlineBetweenSelectors" = false;