diff --git a/profiles/main/data/extensions.yml b/profiles/main/data/extensions.yml index 2b5c95f..e1e5337 100644 --- a/profiles/main/data/extensions.yml +++ b/profiles/main/data/extensions.yml @@ -2,10 +2,16 @@ disabled: - id: yzhang.markdown-all-in-one uuid: 98790d67-10fa-497c-9113-f6c7489207b2 enabled: + - id: alcyon-dev.git-skip + uuid: 75523d75-029e-497d-9151-fda0d14ed9eb + - id: arturock.gitstash + uuid: c6f98943-7f9b-4776-b2a8-409227a481e2 - id: azdavis.rjsonnet uuid: 15f30525-c341-4c4d-ba35-93dbed2bc75c - id: Catppuccin.catppuccin-vsc uuid: 69264e4d-cd3b-468a-8f2b-e69673c7d864 + - id: claui.email-addresses + uuid: 7c44f7a8-aeca-4e65-91e9-26c5fa1690a9 - id: darkriszty.markdown-table-prettify uuid: 136682fc-7ac4-43b7-a50a-bb7890c39f25 - id: detachhead.basedpyright @@ -24,6 +30,8 @@ enabled: uuid: 7b9e492f-afa3-4c1a-9c02-a6ab67fd3552 - id: exiasr.hadolint uuid: c0f361c5-4179-43c5-9cb5-c4eba77388b4 + - id: gitspectra.gitspectra + uuid: cbe92684-a534-4c65-a2a0-b1542ffcbc6c - id: houkanshan.vscode-markdown-footnote uuid: 67d20411-9a51-4004-8982-1f777b4560fd - id: huntertran.auto-markdown-toc @@ -34,8 +42,12 @@ enabled: uuid: 23d65a8c-fcd4-4897-86da-7fe55088e2c6 - id: llvm-vs-code-extensions.vscode-clangd uuid: 103154cb-b81d-4e1b-8281-c5f4fa563d37 + - id: mhutchie.git-graph + uuid: 438221f8-1107-4ccd-a6fe-f3b7fe0856b7 - id: mikerheault.vscode-better-css-stacking-contexts uuid: ca1d8dda-8fd3-42f9-9d30-22e5bbd7d7c3 + - id: mk12.better-git-line-blame + uuid: b470197c-d16f-4953-b8f7-bd7c9ece4278 - id: ms-azuretools.vscode-containers uuid: 2cd1d691-3d69-4d2d-ae39-fda4bc4cfd3d - id: ms-python.black-formatter @@ -54,10 +66,16 @@ enabled: uuid: ab4fb32a-befb-4102-adf9-1652d0cd6a5e - id: ms-toolsai.vscode-jupyter-slideshow uuid: e153ca70-b543-4865-b4c5-b31d34185948 + - id: mskelton.vscode-git-utils + uuid: 0e7b8669-459e-4b0c-bc81-7f515edbcf4b - id: oderwat.indent-rainbow uuid: eaa2127d-cb69-4ab9-8505-a60c9ee5f28b - id: oliversturm.fix-json uuid: da88ed17-dd66-424b-8d92-d6a2222ac171 + - id: perrinjerome.git-commit-syntax + uuid: 162a2ba1-cc30-4ad7-a482-f5c20a242d9f + - id: perrinjerome.git-rebase-syntax + uuid: 3a830e4d-a4de-4ae0-98ff-f136e4c76cbb - id: PKief.material-icon-theme uuid: 5db78037-f674-459f-a236-db622c427c5b - id: redhat.ansible @@ -66,6 +84,8 @@ enabled: uuid: 6703768d-d42f-474e-9f6e-5f288d53f6e8 - id: redhat.vscode-yaml uuid: 2061917f-f76a-458a-8da9-f162de22b97e + - id: renanbs.git-context-menu + uuid: 991149e2-e01e-4601-bb9f-486c0379879c - id: samuelcolvin.jinjahtml uuid: 8b477a76-974c-403d-a454-58028c1709d1 - id: streetsidesoftware.code-spell-checker @@ -78,3 +98,5 @@ enabled: uuid: e3ebbd1d-8614-429b-8542-bfcfd6f83987 - id: zokugun.cron-tasks uuid: b7bbbbd5-7a39-4312-87aa-ef6a41de67fb + - id: zwdai.git-diff-search + uuid: e32efad6-77d4-440b-97f9-2e5dd3e74bac diff --git a/profiles/main/data/keybindings-linux.json b/profiles/main/data/keybindings-linux.json index d95eeee..4aca0a9 100644 --- a/profiles/main/data/keybindings-linux.json +++ b/profiles/main/data/keybindings-linux.json @@ -54,12 +54,12 @@ } }, { - "key": "ctrl+k", + "key": "ctrl+e", "command": "git.openFile", "when": "isInDiffEditor" }, { - "key": "ctrl+k", + "key": "ctrl+e", "command": "git.openChange", "when": "!isInDiffEditor" } diff --git a/profiles/main/data/settings.json b/profiles/main/data/settings.json index 3084f54..41771e2 100644 --- a/profiles/main/data/settings.json +++ b/profiles/main/data/settings.json @@ -186,4 +186,8 @@ "**/.ansible": true }, "chat.extensionUnification.enabled": false, + "gitspectra.scope.branches": [ + "origin/main", + "main" + ], } \ No newline at end of file