Compare commits

..

No commits in common. "33fae52e472ef5c4b8cf36a498796199d333aa01" and "22161de954e2af063da373c9c156023f8ddb67a1" have entirely different histories.

4 changed files with 4 additions and 12 deletions

3
.gitignore vendored
View file

@ -5,6 +5,3 @@ result-*
# ---> Ansible # ---> Ansible
*.retry *.retry
# https://github.com/ansible/ansible-lint/issues/4533
.ansible/

View file

@ -64,6 +64,7 @@
}) })
inputs.agenix.packages.${system}.default inputs.agenix.packages.${system}.default
inputs.plasma-manager.packages.${system}.rc2nix inputs.plasma-manager.packages.${system}.rc2nix
pkgs.ansible
]; ];
}; };
}; };

View file

@ -3,9 +3,9 @@
{ {
programs.git = { programs.git = {
enable = true; enable = true;
settings = { userName = "Katherina Walshe-Grey";
user.email = "git@qenya.tel"; userEmail = "git@qenya.tel";
user.name = "Katherina Walshe-Grey"; extraConfig = {
init.defaultBranch = "main"; init.defaultBranch = "main";
pull.rebase = true; pull.rebase = true;
push.autoSetupRemote = true; push.autoSetupRemote = true;

View file

@ -13,7 +13,6 @@ in
enableExtensionUpdateCheck = false; enableExtensionUpdateCheck = false;
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
redhat.ansible
ms-python.black-formatter ms-python.black-formatter
ms-azuretools.vscode-docker ms-azuretools.vscode-docker
mkhl.direnv mkhl.direnv
@ -28,12 +27,8 @@ in
shopify.ruby-lsp shopify.ruby-lsp
charliermarsh.ruff charliermarsh.ruff
rust-lang.rust-analyzer rust-lang.rust-analyzer
redhat.vscode-yaml
]; ];
userSettings = { 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.spaceAroundSelectorSeparator" = true;
"css.format.newlineBetweenSelectors" = false; "css.format.newlineBetweenSelectors" = false;
"debug.allowBreakpointsEverywhere" = true; "debug.allowBreakpointsEverywhere" = true;
@ -52,7 +47,6 @@ in
formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ]; formatting.command = [ "${pkgs.nixpkgs-fmt}/bin/nixpkgs-fmt" ];
nix.flake.autoArchive = true; nix.flake.autoArchive = true;
}; };
"redhat.telemetry.enabled" = false;
"rust-analyzer.check.command" = "clippy"; "rust-analyzer.check.command" = "clippy";
"terminal.integrated.allowChords" = false; "terminal.integrated.allowChords" = false;
"terminal.integrated.defaultProfile.linux" = "zsh"; "terminal.integrated.defaultProfile.linux" = "zsh";