this repo has no description
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

Minor conflict resolution + vscode ext fixes

+32 -24
+3
.cargo/config.toml
··· 1 1 [registries.crates-io] 2 2 protocol = "sparse" 3 + 4 + [expand] 5 + theme = "Monokai Extended"
+27 -22
.config/Code/User/extensions.txt
··· 9 9 BazelBuild.vscode-bazel@0.7.0 10 10 be5invis.vscode-custom-css@7.1.0 11 11 bierner.markdown-checkbox@0.4.0 12 - bierner.markdown-mermaid@1.17.4 12 + bierner.markdown-mermaid@1.17.7 13 13 bmalehorn.vscode-fish@1.0.33 14 14 bpruitt-goddard.mermaid-markdown-syntax-highlighting@1.5.1 15 - codeout.vscode-junos@0.2.6 15 + codeout.vscode-junos@0.3.0 16 16 codezombiech.gitignore@0.9.0 17 17 corewa-rs.redcode@0.2.0 18 18 dan-c-underwood.arm@1.7.4 ··· 21 21 dnicolson.binary-plist@0.11.0 22 22 DotJoshJohnson.xml@2.5.1 23 23 dunstontc.viml@0.1.7 24 - eamodio.gitlens@13.3.1 24 + eamodio.gitlens@13.4.0 25 25 emeraldwalk.RunOnSave@0.2.0 26 - GitHub.vscode-pull-request-github@0.58.2 27 - golang.go@0.37.1 26 + GitHub.vscode-pull-request-github@0.60.0 27 + golang.go@0.38.0 28 28 Gruntfuggly.todo-tree@0.0.224 29 29 haskell.haskell@2.2.2 30 30 ian-h-chamberlain.pica200@0.1.0 31 31 IBM.output-colorizer@0.1.2 32 - iliazeus.vscode-ansi@1.1.2 32 + iliazeus.vscode-ansi@1.1.5 33 33 janjoerke.jenkins-pipeline-linter-connector@1.2.0 34 34 jasonnutter.vscode-codeowners@1.1.1 35 35 jbenden.c-cpp-flylint@1.13.0 ··· 40 40 justusadam.language-haskell@3.6.0 41 41 korekontrol.saltstack@0.0.9 42 42 kumar-harsh.graphql-for-vscode@1.15.3 43 + LaurentTreguier.rpm-spec@0.3.2 43 44 llvm-vs-code-extensions.vscode-clangd@0.1.23 44 45 mariusschulz.yarn-lock-syntax@0.2.0 45 46 marko2276.yang@0.1.3 46 47 mattn.Lisp@0.1.12 47 - mechatroner.rainbow-csv@3.5.0 48 + mechatroner.rainbow-csv@3.5.1 48 49 moshfeu.compare-folders@0.22.3 49 50 ms-azuretools.vscode-docker@1.24.0 50 51 ms-dotnettools.vscode-dotnet-runtime@1.6.0 51 52 ms-python.isort@2022.8.0 52 - ms-python.python@2023.2.0 53 - ms-python.vscode-pylance@2023.2.40 54 - ms-toolsai.jupyter@2023.1.2010391206 55 - ms-toolsai.jupyter-renderers@1.0.14 56 - ms-vscode-remote.remote-containers@0.275.1 57 - ms-vscode-remote.remote-ssh@0.96.0 53 + ms-python.python@2023.4.1 54 + ms-python.vscode-pylance@2023.3.20 55 + ms-toolsai.jupyter@2023.2.1200692131 56 + ms-toolsai.jupyter-renderers@1.0.15 57 + ms-vscode-remote.remote-containers@0.282.0 58 + ms-vscode-remote.remote-ssh@0.98.0 58 59 ms-vscode-remote.remote-ssh-edit@0.84.0 60 + ms-vscode.azure-account@0.11.3 59 61 ms-vscode.cmake-tools@1.13.45 60 - ms-vscode.cpptools@1.14.3 62 + ms-vscode.cpptools@1.14.4 61 63 ms-vscode.hexeditor@1.9.11 62 - ms-vscode.live-server@0.4.5 64 + ms-vscode.live-server@0.4.7 63 65 ms-vscode.remote-explorer@0.2.0 64 66 ms-vscode.vscode-serial-monitor@0.8.0 65 - ms-vsliveshare.vsliveshare@1.0.5832 67 + ms-vscode.vscode-typescript-tslint-plugin@1.3.4 68 + ms-vsliveshare.vsliveshare@1.0.5834 66 69 neilding.language-liquid@0.1.1 67 70 nico-castell.linux-desktop-file@0.0.21 68 71 NicolasVuillamy.vscode-groovy-lint@2.0.0 ··· 71 74 rebornix.ruby@0.28.1 72 75 redhat.vscode-commons@0.0.6 73 76 redhat.vscode-xml@0.24.0 74 - redhat.vscode-yaml@1.11.0 77 + redhat.vscode-yaml@1.12.2 75 78 ria.elastic@0.13.3 76 79 richie5um2.vscode-sort-json@1.20.0 80 + rioj7.command-variable@1.49.1 77 81 robocorp.robotframework-lsp@1.9.0 78 82 RReverser.llvm@0.1.1 79 - rust-lang.rust-analyzer@0.3.1410 80 - ryanluker.vscode-coverage-gutters@2.10.3 83 + rust-lang.rust-analyzer@0.3.1443 84 + ryanluker.vscode-coverage-gutters@2.10.4 81 85 samuelcolvin.jinjahtml@0.20.0 82 86 sleistner.vscode-fileutils@3.10.0 83 87 slevesque.shader@1.1.5 84 88 stevensona.shader-toy@0.10.15 85 - streetsidesoftware.code-spell-checker@2.17.1 89 + streetsidesoftware.code-spell-checker@2.20.3 86 90 tamasfe.even-better-toml@0.19.0 87 91 timonwong.shellcheck@0.29.4 88 92 trond-snekvik.gnu-mapfiles@1.1.0 89 93 twxs.cmake@0.0.17 90 94 Tyriar.sort-lines@1.9.1 91 - vadimcn.vscode-lldb@1.8.1 95 + vadimcn.vscode-lldb@1.9.0 92 96 Veracosta.mib@0.0.4 93 - vsciot-vscode.vscode-arduino@0.5.0 97 + vsciot-vscode.vscode-arduino@0.6.0 94 98 vscode-org-mode.org-mode@1.0.0 95 99 vstirbu.vscode-mermaid-preview@1.6.3 96 100 warpnet.salt-lint@0.1.0 ··· 101 105 xaver.clang-format@1.9.0 102 106 xoronic.pestfile@0.4.0 103 107 yy0931.gitconfig-lsp@0.9.3 108 + zhouronghui.propertylist@0.0.2 104 109 ZixuanWang.linkerscript@1.0.3 105 110 zxh404.vscode-proto3@0.5.5
+2 -2
.gitmodules
··· 16 16 [submodule ".vim/pack/bundle/start/info.vim"] 17 17 path = .vim/pack/bundle/start/info.vim 18 18 url = https://gitlab.com/HiPhish/info.vim 19 - [submodule "/Users/ichamberlain/.pyenv/plugins/pyenv-pyright"] 20 - path = /Users/ichamberlain/.pyenv/plugins/pyenv-pyright 19 + [submodule ".pyenv/plugins/pyenv-pyright"] 20 + path = .pyenv/plugins/pyenv-pyright 21 21 url = https://github.com/alefpereira/pyenv-pyright.git