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/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/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; diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix index 87c2dec..bfbea1c 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,12 @@ in shopify.ruby-lsp charliermarsh.ruff rust-lang.rust-analyzer + redhat.vscode-yaml ]; userSettings = { + "ansible.validation.lint.enabled" = true; + "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; "debug.allowBreakpointsEverywhere" = true; @@ -47,6 +52,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";