From a0aae4711dfb89a3465cb15d39c2bf90438a369d Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Tue, 3 Dec 2024 03:12:40 +0100 Subject: [PATCH 01/22] fix(plugin/overseer,dap): Overseer not loading, simplify DAP config (a bit) --- nvim/ftplugin/c.lua | 6 ++++-- nvim/plugin/overseer.lua | 6 +++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/nvim/ftplugin/c.lua b/nvim/ftplugin/c.lua index 4f13718..7475a5e 100644 --- a/nvim/ftplugin/c.lua +++ b/nvim/ftplugin/c.lua @@ -11,10 +11,12 @@ local root_files = { '.git', } +local root = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]) + vim.lsp.start { name = 'clangd', cmd = { 'clangd' }, - root_dir = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]), + root_dir = root, capabilities = require('user.lsp').make_client_capabilities(), filetypes = { "c" }, on_attach = function(client, bufnr) @@ -39,7 +41,7 @@ if vim.fn.executable('gdb') == 1 then end -- DAP loads this automatically as of now. May be needed to load the debugger for asm? --- if require('user.file_exists').file_exists(vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]) .. "/.vscode/launch.json") then +-- if require('user.file_exists').file_exists(root .. "/.vscode/launch.json") then -- require("dap.ext.vscode").load_launchjs(nil, { cppdbg = { "c", "cpp", "asm" } }) -- require("dap.ext.vscode").load_launchjs(nil, { gdb = { "c", "cpp", "asm" } }) -- end diff --git a/nvim/plugin/overseer.lua b/nvim/plugin/overseer.lua index c5c93e7..7d4514b 100644 --- a/nvim/plugin/overseer.lua +++ b/nvim/plugin/overseer.lua @@ -8,7 +8,7 @@ local file_exists = require("user.file_exists").file_exists require("which-key").add({ { "<leader>o", group = "[o]verseer", icon = "" }, { "<leader>ot", "<Cmd>OverseerToggle<CR>", desc = "[o]verseer: [t]oggle " }, - { "<leader>oc", "<Cmd>OverseerRunCmd<CR>", desc = "[o]verseer: run [c]ommand" }, + { "<leader>oc", "<Cmd>OverseerRunCmd<CR>", desc = "[o]verseer: run [c]ommand" }, { "<leader>or", "<Cmd>OverseerRun<CR>", desc = "[o]verseer: [r]un task" }, { "<leader>oq", "<Cmd>OverseerQuickAction<CR>", desc = "[o]verseer: [q]uick action" }, { "<leader>oa", "<Cmd>OverseerTaskAction<CR>", desc = "[o]verseer: task [a]ction" }, @@ -20,10 +20,10 @@ local root_files = { '.git', } -local root = vim.fs.find(root_files, { upward = true })[1] +local root = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]) if root then - if file_exists(root .. ".vscode/tasks.json") then + if file_exists(root .. "/.vscode/tasks.json") then require('overseer').setup({ strategy = { "toggleterm", From 64564114ff80db4f83a9fc645a3d366bf7087bd0 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Fri, 13 Dec 2024 13:08:12 +0100 Subject: [PATCH 02/22] fix(ci/update): Rename secrets to represent source host --- .github/workflows/update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 982d05e..4c5dc10 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -20,7 +20,7 @@ jobs: uses: DeterminateSystems/update-flake-lock@main with: # inputs: dzgui dzgui-testing # We'll see whether I want to limit the updates to dzgui - token: ${{ secrets.GH_TOKEN_FOR_UPDATES }} + token: ${{ secrets.FORGEJO_TOKEN_FOR_UPDATES }} pr-title: "Update flake.lock" pr-assignees: jiriks74 pr-labels: | From ed72f266de03766ffbd71aa4b1d94ce49e8d8460 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Fri, 13 Dec 2024 13:12:20 +0100 Subject: [PATCH 03/22] fix(ci): Use full URLs for CI Actions Forgejo uses https://code.forgejo.org not https://github.com as the default path --- .github/workflows/check.yml | 18 +++++++++--------- .github/workflows/update.yml | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 6b70631..5c45e43 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -11,13 +11,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install nix - uses: DeterminateSystems/nix-installer-action@main + uses: https://github.com/DeterminateSystems/nix-installer-action@main - name: Setup Action cache for nix - uses: DeterminateSystems/magic-nix-cache-action@main + uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main with: fail-mode: true - name: Check Nix flake inputs - uses: DeterminateSystems/flake-checker-action@v4 # This action + uses: https://github.com/DeterminateSystems/flake-checker-action@v4 # This action - name: Run nix fmt run: nix fmt -- --check . @@ -26,13 +26,13 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install nix - uses: DeterminateSystems/nix-installer-action@main + uses: https://github.com/DeterminateSystems/nix-installer-action@main - name: Setup Action cache for nix - uses: DeterminateSystems/magic-nix-cache-action@main + uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main with: fail-mode: true - name: Check Nix flake inputs - uses: DeterminateSystems/flake-checker-action@v4 # This action + uses: https://github.com/DeterminateSystems/flake-checker-action@v4 # This action - name: Run nix flake check run: nix flake check @@ -41,12 +41,12 @@ jobs: steps: - uses: actions/checkout@v4 - name: Install nix - uses: DeterminateSystems/nix-installer-action@main + uses: https://github.com/DeterminateSystems/nix-installer-action@main - name: Setup Action cache for nix - uses: DeterminateSystems/magic-nix-cache-action@main + uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main with: fail-mode: true - name: Check Nix flake inputs - uses: DeterminateSystems/flake-checker-action@v4 # This action + uses: https://github.com/DeterminateSystems/flake-checker-action@v4 # This action - name: Build nvim run: nix build .\#default diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 4c5dc10..b4796b9 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -11,13 +11,13 @@ jobs: - name: Checkout repository uses: actions/checkout@v4 - name: Install nix - uses: DeterminateSystems/nix-installer-action@main + uses: https://github.com/DeterminateSystems/nix-installer-action@main - name: Setup Action cache for nix - uses: DeterminateSystems/magic-nix-cache-action@main + uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main with: fail-mode: true - name: Update flake.lock - uses: DeterminateSystems/update-flake-lock@main + uses: https://github.com/DeterminateSystems/update-flake-lock@main with: # inputs: dzgui dzgui-testing # We'll see whether I want to limit the updates to dzgui token: ${{ secrets.FORGEJO_TOKEN_FOR_UPDATES }} From 83dab209c012acb7ba2730431564b699212b8808 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Fri, 13 Dec 2024 14:02:34 +0100 Subject: [PATCH 04/22] fix: Use custom action for updating `flake.lock` --- .github/workflows/update.yml | 76 ++++++++++++++++++++++++++++++------ 1 file changed, 65 insertions(+), 11 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index b4796b9..1bf276c 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -14,17 +14,71 @@ jobs: uses: https://github.com/DeterminateSystems/nix-installer-action@main - name: Setup Action cache for nix uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main - with: - fail-mode: true + - name: Update flake.lock - uses: https://github.com/DeterminateSystems/update-flake-lock@main + id: update + run: | + nix flake update 2> >(tee /dev/stderr) | awk ' + /^• Updated input/ {in_update = 1; print; next} + in_update && !/^warning:/ {print} + /^$/ {in_update = 0} + ' > update.log + + echo "UPDATE_LOG<<EOF" >> $GITHUB_ENV + cat update.log >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV + + rm update.log + + - name: Write PR body template + uses: https://github.com/DamianReeves/write-file-action@v1.3 with: - # inputs: dzgui dzgui-testing # We'll see whether I want to limit the updates to dzgui - token: ${{ secrets.FORGEJO_TOKEN_FOR_UPDATES }} - pr-title: "Update flake.lock" - pr-assignees: jiriks74 - pr-labels: | - flake.lock - automated + path: pr_body.template + contents: | + - The following Nix Flake inputs were updated: + + ``` + ${{ env.UPDATE_LOG }} + ``` + + Auto-generated by [update.yml][1] with the help of + [create-pull-request][2]. + + [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml + [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request + + - name: Generate PR body + uses: pedrolamas/handlebars-action@v2.4.0 # v2.4.0 + with: + files: "pr_body.template" + output-filename: "pr_body.md" + - name: Save PR body + id: pr_body + uses: juliangruber/read-file-action@v1 + with: + path: "pr_body.md" + + - name: Remove temporary files + run: | + rm pr_body.template + rm pr_body.md + + - name: Create Pull Request + id: create-pull-request + uses: https://forgejo.stefka.eu/jiriks74/create-pull-request@7174d368c2e4450dea17b297819eb28ae93ee645 + with: + token: ${{ secrets.FORGEJO_TOKEN_FOR_UPDATES }} + body: ${{ steps.pr_body.outputs.content }} + author: '"github-actions[bot]" <github-actions[bot]@users.noreply.github.com>' + title: 'automated: Update `flake.lock`' + commit-message: | + automated: Update `flake.lock` + + ${{ steps.pr_body.outputs.content }} + + branch: update-flake-lock + delete-branch: true - name: Print PR number - run: echo Pull request number is ${{ steps.update.outputs.pull-request-number }}. + run: | + echo "Pull request number is ${{ steps.create-pull-request.outputs.pull-request-number }}." + echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}" From c886aca5d40416a219f81bba9c30f654934ea0b0 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Mon, 16 Dec 2024 03:45:19 +0100 Subject: [PATCH 05/22] fix(ci/update): Drop cache action It's useless for just updating nix flake inputs --- .github/workflows/update.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 1bf276c..6bfba98 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -12,8 +12,6 @@ jobs: uses: actions/checkout@v4 - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - name: Setup Action cache for nix - uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main - name: Update flake.lock id: update From f2df89bcf79af03a76dd64ff5d83c4d874ec7919 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Thu, 19 Dec 2024 11:12:43 +0100 Subject: [PATCH 06/22] fix(ci): Remove `nix` cache action as it barely works It takes 11 minutes to cache everything on a otherwise 2 minute job. Nix doesn't even pull from it most of the time. --- .github/workflows/check.yml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 5c45e43..0f417d9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -12,10 +12,6 @@ jobs: - uses: actions/checkout@v4 - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - name: Setup Action cache for nix - uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main - with: - fail-mode: true - name: Check Nix flake inputs uses: https://github.com/DeterminateSystems/flake-checker-action@v4 # This action - name: Run nix fmt @@ -27,10 +23,6 @@ jobs: - uses: actions/checkout@v4 - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - name: Setup Action cache for nix - uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main - with: - fail-mode: true - name: Check Nix flake inputs uses: https://github.com/DeterminateSystems/flake-checker-action@v4 # This action - name: Run nix flake check @@ -42,10 +34,6 @@ jobs: - uses: actions/checkout@v4 - name: Install nix uses: https://github.com/DeterminateSystems/nix-installer-action@main - - name: Setup Action cache for nix - uses: https://github.com/DeterminateSystems/magic-nix-cache-action@main - with: - fail-mode: true - name: Check Nix flake inputs uses: https://github.com/DeterminateSystems/flake-checker-action@v4 # This action - name: Build nvim From 8248c71bd8ef7ff23853e7fdc2201a92f507c977 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 09:54:13 +0000 Subject: [PATCH 07/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/4633a7c72337ea8fd23a4f2ba3972865e3ec685d?narHash=sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0%3D' (2024-11-25) → 'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33?narHash=sha256-cHar1vqHOOyC7f1%2BtVycPoWTfKIaqkoe1Q6TnKzuti4%3D' (2024-12-17) • Updated input 'presence-nvim': 'github:jiriks74/presence.nvim/df0a0b52cd0799e99d1b76805d1357ae9c0d017d?narHash=sha256-NuoXsCOA5Uz7XOtC5B1pIXLytLaod6wUzrE%2Bm5uEHcs%3D' (2024-10-07) → 'github:jiriks74/presence.nvim/c850b9e245f310e040478ab54808c7ce098919ed?narHash=sha256-NuoXsCOA5Uz7XOtC5B1pIXLytLaod6wUzrE%2Bm5uEHcs%3D' (2024-12-13) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 825b71f..e809290 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1732521221, - "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=", + "lastModified": 1734424634, + "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d", + "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", "type": "github" }, "original": { @@ -198,11 +198,11 @@ "presence-nvim": { "flake": false, "locked": { - "lastModified": 1728312592, + "lastModified": 1734057239, "narHash": "sha256-NuoXsCOA5Uz7XOtC5B1pIXLytLaod6wUzrE+m5uEHcs=", "owner": "jiriks74", "repo": "presence.nvim", - "rev": "df0a0b52cd0799e99d1b76805d1357ae9c0d017d", + "rev": "c850b9e245f310e040478ab54808c7ce098919ed", "type": "github" }, "original": { From aa027982c7b3fbc20a5c10a16a9ff8f3c3e7a068 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Sun, 29 Dec 2024 02:59:37 +0100 Subject: [PATCH 08/22] fix(ci/update): Update on Saturday so that the action for jiriks74/os.home.nix can pull this after it's merged on Sunday --- .github/workflows/update.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 6bfba98..da1827e 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -2,7 +2,7 @@ name: Update `flake.lock` on: workflow_dispatch: schedule: - - cron: '0 0 * * 0' # runs weekly on Sunday at 00:00 + - cron: '0 0 * * 6' # runs weekly on Saturday at 00:00 jobs: update_lockfile: From cae66c4d1dbd541ff9165376356fbfae74c6f5e1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sun, 29 Dec 2024 00:51:04 +0000 Subject: [PATCH 09/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/d3c42f187194c26d9f0309a8ecc469d6c878ce33?narHash=sha256-cHar1vqHOOyC7f1%2BtVycPoWTfKIaqkoe1Q6TnKzuti4%3D' (2024-12-17) → 'github:NixOS/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index e809290..3e83ab4 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1735291276, + "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", "type": "github" }, "original": { From 147a80a0f143ece05d6f5d95f1f5fd7142db946d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 4 Jan 2025 00:01:03 +0000 Subject: [PATCH 10/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/634fd46801442d760e09493a794c4f15db2d0cbb?narHash=sha256-NYVcA06%2BblsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M%3D' (2024-12-27) → 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 3e83ab4..bf1613d 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { From a5c4375d05c002ef6939d935ce799b92a4413f69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 00:01:05 +0000 Subject: [PATCH 11/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/6df24922a1400241dae323af55f30e4318a6ca65?narHash=sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk%3D' (2025-01-02) → 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index bf1613d..26581a9 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1735834308, - "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", + "lastModified": 1736344531, + "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6df24922a1400241dae323af55f30e4318a6ca65", + "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "type": "github" }, "original": { From b75e7c94f5e5763b6c70b3f356fe1dbd1ec009c0 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Wed, 15 Jan 2025 11:57:09 +0100 Subject: [PATCH 12/22] feat(languages): Add Python --- nix/neovim-overlay.nix | 10 ++++++++-- nvim/ftplugin/python.lua | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 nvim/ftplugin/python.lua diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix index 3e96063..9399e65 100644 --- a/nix/neovim-overlay.nix +++ b/nix/neovim-overlay.nix @@ -128,10 +128,16 @@ with final.pkgs.lib; let asm-lsp # Assembly language server clang-tools # C/C++ language server (callPackage ./cpptools.nix {}) # C/C++ debugger from VSCode | https://github.com/microsoft/vscode-cpptools + nil # nix LSP nodePackages.bash-language-server # Bash language server lua-language-server - nil # nix LSP - ]; + ] ++ [ (pkgs.python312.withPackages (python-pkgs: [ + python-pkgs.python-lsp-server + python-pkgs.python-lsp-ruff + python-pkgs.pylsp-mypy + python-pkgs.pylsp-rope + ]))]; + in { # This is the neovim derivation # returned by the overlay diff --git a/nvim/ftplugin/python.lua b/nvim/ftplugin/python.lua new file mode 100644 index 0000000..5d04524 --- /dev/null +++ b/nvim/ftplugin/python.lua @@ -0,0 +1,36 @@ +-- Exit if the language server isn't available +if vim.fn.executable('pylsp') ~= 1 then + return +end + +local root_files = { + 'pyproject.toml', + 'setup.py', + 'setup.cfg', + 'requirements.txt', + 'Pipfile', + 'pyrightconfig.json', + '.git', +} + +vim.lsp.start({ + name = 'python-lsp-server', + cmd = { "pylsp" }, + root_dir = vim.fs.dirname(vim.fs.find(root_files, { upward = true })[1]), + capabilities = require('user.lsp').make_client_capabilities(), + filetypes = { 'python' }, + on_attach = function(client, bufnr) + require("nvim-navic").attach(client, bufnr) + require("workspace-diagnostics").populate_workspace_diagnostics(client, bufnr) + end, + settings = { + pylsp = { + plugins = { + mypy = { enabled = true, }, + rope = { enabled = true, }, + ruff = { enabled = true, }, + }, + }, + }, + single_file_support = true +}) From ea68d8de0b005ca1db1d2770c7cf99f35b5e2d35 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Thu, 16 Jan 2025 09:17:59 +0100 Subject: [PATCH 13/22] fix: Formatting --- nix/neovim-overlay.nix | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-) diff --git a/nix/neovim-overlay.nix b/nix/neovim-overlay.nix index 9399e65..2e3f2fb 100644 --- a/nix/neovim-overlay.nix +++ b/nix/neovim-overlay.nix @@ -120,24 +120,27 @@ with final.pkgs.lib; let # ^ bleeding-edge plugins from flake inputs ]; - extraPackages = with pkgs; [ - # Dependencies - ripgrep - - # language servers, etc. - asm-lsp # Assembly language server - clang-tools # C/C++ language server - (callPackage ./cpptools.nix {}) # C/C++ debugger from VSCode | https://github.com/microsoft/vscode-cpptools - nil # nix LSP - nodePackages.bash-language-server # Bash language server - lua-language-server - ] ++ [ (pkgs.python312.withPackages (python-pkgs: [ - python-pkgs.python-lsp-server - python-pkgs.python-lsp-ruff - python-pkgs.pylsp-mypy - python-pkgs.pylsp-rope - ]))]; + extraPackages = with pkgs; + [ + # Dependencies + ripgrep + # language servers, etc. + asm-lsp # Assembly language server + clang-tools # C/C++ language server + (callPackage ./cpptools.nix {}) # C/C++ debugger from VSCode | https://github.com/microsoft/vscode-cpptools + nil # nix LSP + nodePackages.bash-language-server # Bash language server + lua-language-server + ] + ++ [ + (pkgs.python312.withPackages (python-pkgs: [ + python-pkgs.python-lsp-server + python-pkgs.python-lsp-ruff + python-pkgs.pylsp-mypy + python-pkgs.pylsp-rope + ])) + ]; in { # This is the neovim derivation # returned by the overlay From 3ea29b1f8bd2d5e731ff05b5c5eef21ea01a3494 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 18 Jan 2025 00:01:07 +0000 Subject: [PATCH 14/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/bffc22eb12172e6db3c5dde9e3e5628f8e3e7912?narHash=sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc%2Bc2c%3D' (2025-01-08) → 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 26581a9..32cef8d 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { From ef7cd8341a4c4b64e5df90a90952bcebb47a4628 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Mon, 3 Feb 2025 23:37:10 +0000 Subject: [PATCH 15/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5df43628fdf08d642be8ba5b3625a6c70731c19c?narHash=sha256-Tbk1MZbtV2s5aG%2BiM99U8FqwxU/YNArMcWAv6clcsBc%3D' (2025-01-16) → 'github:NixOS/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 32cef8d..23371c1 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1737062831, - "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { From d7e15e5edcbfad734479ad3c942c0310afa49aea Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sun, 9 Feb 2025 22:43:36 +0000 Subject: [PATCH 16/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01) → 'github:NixOS/nixpkgs/a79cfe0ebd24952b580b1cf08cd906354996d547?narHash=sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y%3D' (2025-02-08) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 23371c1..cca525b 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { From 35fe9f2e181a2500052261724de9ca06ca65d1b1 Mon Sep 17 00:00:00 2001 From: jiriks74 <jiri@stefka.eu> Date: Sun, 9 Feb 2025 23:52:20 +0100 Subject: [PATCH 17/22] Revert "automated: Update `flake.lock`" Broken luajit package This reverts commit d7e15e5edcbfad734479ad3c942c0310afa49aea. --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index cca525b..23371c1 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1739020877, - "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { From a2590c6eb025a14e87b81b1d4e8413978a7e186e Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 1 Mar 2025 00:02:08 +0000 Subject: [PATCH 18/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/3a228057f5b619feb3186e986dbe76278d707b6e?narHash=sha256-xvTo0Aw0%2Bveek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc%3D' (2025-02-01) → 'github:NixOS/nixpkgs/5135c59491985879812717f4c9fea69604e7f26f?narHash=sha256-Vr3Qi346M%2B8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic%3D' (2025-02-26) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 23371c1..a8a2b30 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738410390, - "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", + "lastModified": 1740560979, + "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", + "rev": "5135c59491985879812717f4c9fea69604e7f26f", "type": "github" }, "original": { From 133f6864833171c8339d32cc3b41229b7eb86ab6 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 8 Mar 2025 00:02:06 +0000 Subject: [PATCH 19/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/5135c59491985879812717f4c9fea69604e7f26f?narHash=sha256-Vr3Qi346M%2B8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic%3D' (2025-02-26) → 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a8a2b30..b0add39 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740560979, - "narHash": "sha256-Vr3Qi346M+8CjedtbyUevIGDZW8LcA1fTG0ugPY/Hic=", + "lastModified": 1741246872, + "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5135c59491985879812717f4c9fea69604e7f26f", + "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", "type": "github" }, "original": { From 35fc0105c6f81273648d200b8de976324fcc9e24 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 22 Mar 2025 00:01:55 +0000 Subject: [PATCH 20/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/10069ef4cf863633f57238f179a0297de84bd8d3?narHash=sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U%3D' (2025-03-06) → 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b0add39..2a53dc3 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1741246872, - "narHash": "sha256-Q6pMP4a9ed636qilcYX8XUguvKl/0/LGXhHcRI91p0U=", + "lastModified": 1742422364, + "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "10069ef4cf863633f57238f179a0297de84bd8d3", + "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", "type": "github" }, "original": { From 9e1fe892aba2ba2e21bb183534cd37c371357f00 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 19 Apr 2025 00:11:20 +0000 Subject: [PATCH 21/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/a84ebe20c6bc2ecbcfb000a50776219f48d134cc?narHash=sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ%3D' (2025-03-19) → 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2a53dc3..eb7f8a0 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1742422364, - "narHash": "sha256-mNqIplmEohk5jRkqYqG19GA8MbQ/D4gQSK0Mu4LvfRQ=", + "lastModified": 1744932701, + "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a84ebe20c6bc2ecbcfb000a50776219f48d134cc", + "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", "type": "github" }, "original": { From a662bdb24993cc18f3ce34289fd9eb1a06147707 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com> Date: Sat, 31 May 2025 00:10:35 +0000 Subject: [PATCH 22/22] automated: Update `flake.lock` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - The following Nix Flake inputs were updated: ``` • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef?narHash=sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU%3D' (2025-04-17) → 'github:NixOS/nixpkgs/96ec055edbe5ee227f28cdbc3f1ddf1df5965102?narHash=sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg%3D' (2025-05-28) • Updated input 'workspace-diagnostics-nvim': 'github:artemave/workspace-diagnostics.nvim/573ff93c47898967efdfbc6587a1a39e3c2d365e?narHash=sha256-lBj4KUPmmhtpffYky/HpaTwY%2B%2Bd/Q9socp/Ys%2B4VeX0%3D' (2024-08-10) → 'github:artemave/workspace-diagnostics.nvim/60f9175b2501ae3f8b1aba9719c0df8827610c8e?narHash=sha256-jSpKaKnGyip/nzqU52ypWLgoCtvccYN%2Bqb5jzlwAnd4%3D' (2025-05-25) ``` Auto-generated by [update.yml][1] with the help of [create-pull-request][2]. [1]: https://forgejo.stefka.eu/jiriks74/nix.nvim/src/branch/main/.github/workflows/update.yml [2]: https://forgejo.stefka.eu/jiriks74/create-pull-request --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index eb7f8a0..e31bc9b 100644 --- a/flake.lock +++ b/flake.lock @@ -181,11 +181,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1748460289, + "narHash": "sha256-7doLyJBzCllvqX4gszYtmZUToxKvMUrg45EUWaUYmBg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "96ec055edbe5ee227f28cdbc3f1ddf1df5965102", "type": "github" }, "original": { @@ -238,11 +238,11 @@ "workspace-diagnostics-nvim": { "flake": false, "locked": { - "lastModified": 1723294887, - "narHash": "sha256-lBj4KUPmmhtpffYky/HpaTwY++d/Q9socp/Ys+4VeX0=", + "lastModified": 1748191681, + "narHash": "sha256-jSpKaKnGyip/nzqU52ypWLgoCtvccYN+qb5jzlwAnd4=", "owner": "artemave", "repo": "workspace-diagnostics.nvim", - "rev": "573ff93c47898967efdfbc6587a1a39e3c2d365e", + "rev": "60f9175b2501ae3f8b1aba9719c0df8827610c8e", "type": "github" }, "original": {