diff --git a/.github/workflows/cachix.yml b/.github/workflows/cachix.yml index d136c65..dbf4ceb 100644 --- a/.github/workflows/cachix.yml +++ b/.github/workflows/cachix.yml @@ -20,10 +20,11 @@ jobs: - uses: cachix/install-nix-action@v25 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} + - uses: DeterminateSystems/magic-nix-cache-action@v4 - uses: cachix/cachix-action@v14 with: name: willruggiano authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - run: nix build --accept-flake-config - run: nix flake check --accept-flake-config --impure + - run: nix build --accept-flake-config - run: cachix pin willruggiano nvim-drv "$(nix build --accept-flake-config --print-out-paths)" diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 7c8dd59..10d1c18 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -17,21 +17,30 @@ jobs: update: runs-on: ubuntu-latest steps: + - uses: easimon/maximize-build-space@v10 + with: + overprovision-lvm: true + remove-android: true + remove-codeql: true + remove-docker-images: true + remove-dotnet: true + remove-haskell: true - uses: actions/checkout@v4 - uses: webfactory/ssh-agent@v0.9.0 with: ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - uses: cachix/install-nix-action@v25 + - uses: cachix/install-nix-action@v26 with: github_access_token: ${{ secrets.GITHUB_TOKEN }} + extra_nix_config: | + accept-flake-config = true + - uses: DeterminateSystems/magic-nix-cache-action@v4 - uses: cachix/cachix-action@v14 with: name: willruggiano authToken: "${{ secrets.CACHIX_AUTH_TOKEN }}" - - run: nix run .#update - - run: nix build --accept-flake-config - - run: | - git config --global user.name 'github-actions[bot]' - git config --global user.email 'willruggiano@users.noreply.github.com' - git commit -am 'chore: 🌶️🌶️🌶️' || exit 0 - git push + - name: nix run .#ci + run: | + git config --global user.name 'github-actions[bot]' && + git config --global user.email '41898282+github-actions[bot]@users.noreply.github.com' && + nix run .#ci diff --git a/flake.lock b/flake.lock index 4290c51..4d39f3a 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,29 @@ { "nodes": { + "cachix": { + "inputs": { + "devenv": "devenv_2", + "flake-compat": "flake-compat_2", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "pre-commit-hooks": "pre-commit-hooks" + }, + "locked": { + "lastModified": 1710475558, + "narHash": "sha256-egKrPCKjy/cE+NqCj4hg2fNX/NwLCf0bRDInraYXDgs=", + "owner": "cachix", + "repo": "cachix", + "rev": "661bbb7f8b55722a0406456b15267b5426a3bda6", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "cachix", + "type": "github" + } + }, "crane": { "flake": false, "locked": { @@ -19,21 +43,53 @@ }, "devenv": { "inputs": { - "flake-compat": "flake-compat", + "cachix": "cachix", + "flake-compat": "flake-compat_4", + "nix": "nix_2", + "nixpkgs": "nixpkgs_2", + "pre-commit-hooks": "pre-commit-hooks_2" + }, + "locked": { + "lastModified": 1712059314, + "narHash": "sha256-OhYUnIBIMN/oICxRGx4FbHyjBQDIc3L/gGrjAMfQu14=", + "owner": "cachix", + "repo": "devenv", + "rev": "a18e86ab317a82c2e7d626d28ba1b3a9eb11d23b", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "devenv", + "type": "github" + } + }, + "devenv_2": { + "inputs": { + "flake-compat": [ + "devenv", + "cachix", + "flake-compat" + ], "nix": "nix", "nixpkgs": "nixpkgs", - "pre-commit-hooks": "pre-commit-hooks" + "poetry2nix": "poetry2nix", + "pre-commit-hooks": [ + "devenv", + "cachix", + "pre-commit-hooks" + ] }, "locked": { - "lastModified": 1710144971, - "narHash": "sha256-CjTOdoBvT/4AQncTL20SDHyJNgsXZjtGbz62yDIUYnM=", + "lastModified": 1708704632, + "narHash": "sha256-w+dOIW60FKMaHI1q5714CSibk99JfYxm0CzTinYWr+Q=", "owner": "cachix", "repo": "devenv", - "rev": "6c0bad0045f1e1802f769f7890f6a59504825f4d", + "rev": "2ee4450b0f4b95a1b90f2eb5ffea98b90e48c196", "type": "github" }, "original": { "owner": "cachix", + "ref": "python-rewrite", "repo": "devenv", "type": "github" } @@ -83,7 +139,7 @@ }, "dream2nix_2": { "inputs": { - "nixpkgs": "nixpkgs_11", + "nixpkgs": "nixpkgs_12", "purescript-overlay": "purescript-overlay", "pyproject-nix": "pyproject-nix" }, @@ -118,6 +174,54 @@ } }, "flake-compat_2": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_5": { "flake": false, "locked": { "lastModified": 1673956053, @@ -133,7 +237,7 @@ "type": "github" } }, - "flake-compat_3": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1673956053, @@ -149,7 +253,23 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_7": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_8": { "flake": false, "locked": { "lastModified": 1673956053, @@ -170,11 +290,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1709336216, - "narHash": "sha256-Dt/wOWeW6Sqm11Yh+2+t0dfEWxoMxGBvv3JpIocFl9E=", + "lastModified": 1712014858, + "narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2", + "rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "type": "github" }, "original": { @@ -206,11 +326,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1689068808, + "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4", "type": "github" }, "original": { @@ -220,6 +340,42 @@ } }, "flake-utils_10": { + "inputs": { + "systems": "systems_9" + }, + "locked": { + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_11": { + "inputs": { + "systems": "systems_10" + }, + "locked": { + "lastModified": 1710146030, + "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_12": { "locked": { "lastModified": 1659877975, "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", @@ -253,12 +409,15 @@ } }, "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -269,7 +428,7 @@ }, "flake-utils_4": { "inputs": { - "systems": "systems_3" + "systems": "systems_4" }, "locked": { "lastModified": 1701680307, @@ -286,15 +445,12 @@ } }, "flake-utils_5": { - "inputs": { - "systems": "systems_4" - }, "locked": { - "lastModified": 1694529238, - "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", "owner": "numtide", "repo": "flake-utils", - "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", "type": "github" }, "original": { @@ -308,11 +464,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1701680307, + "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", "type": "github" }, "original": { @@ -326,11 +482,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1681202837, - "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "cfacdce06f30d2b68473a46042957675eebb3401", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -344,11 +500,11 @@ "systems": "systems_7" }, "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -362,11 +518,11 @@ "systems": "systems_8" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1681202837, + "narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "cfacdce06f30d2b68473a46042957675eebb3401", "type": "github" }, "original": { @@ -379,16 +535,17 @@ "inputs": { "nixpkgs": [ "devenv", + "cachix", "pre-commit-hooks", "nixpkgs" ] }, "locked": { - "lastModified": 1660459072, - "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", "owner": "hercules-ci", "repo": "gitignore.nix", - "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", "type": "github" }, "original": { @@ -398,6 +555,28 @@ } }, "gitignore_2": { + "inputs": { + "nixpkgs": [ + "devenv", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1703887061, + "narHash": "sha256-gGPa9qWNc6eCXT/+Z5/zMkyYOuRZqeFZBDbopNZQkuY=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "43e1aa1308018f37118e34d3a9cb4f5e75dc11d5", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, + "gitignore_3": { "inputs": { "nixpkgs": [ "neovim-nix", @@ -419,7 +598,7 @@ "type": "github" } }, - "gitignore_3": { + "gitignore_4": { "inputs": { "nixpkgs": [ "sg-nvim", @@ -441,7 +620,7 @@ "type": "github" } }, - "gitignore_4": { + "gitignore_5": { "inputs": { "nixpkgs": [ "zls", @@ -490,22 +669,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, "mk-naked-shell": { "flake": false, "locked": { @@ -542,7 +705,7 @@ "crane": "crane", "dream2nix": "dream2nix", "mk-naked-shell": "mk-naked-shell", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_8", "parts": "parts", "rust-overlay": "rust-overlay_2", "treefmt": "treefmt" @@ -563,16 +726,16 @@ }, "neovim": { "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_2" + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_3" }, "locked": { "dir": "contrib", - "lastModified": 1710729341, - "narHash": "sha256-MSym75mhKb5odB57+0sPpTzQ1lRlydavEUGuCXMLnd4=", + "lastModified": 1712033301, + "narHash": "sha256-5D6T1XOTKkZrCKs0sM2feOveXqRijUV6m9N2DALErp8=", "owner": "neovim", "repo": "neovim", - "rev": "9d315fb8b728355e8f1872f783b1ae9948e4fd9b", + "rev": "b3f9da9524b0b1bb992d3dd84eaa92980923cb3e", "type": "github" }, "original": { @@ -610,8 +773,8 @@ }, "nil": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_4", + "flake-utils": "flake-utils_6", + "nixpkgs": "nixpkgs_5", "rust-overlay": "rust-overlay" }, "locked": { @@ -630,39 +793,65 @@ }, "nix": { "inputs": { - "lowdown-src": "lowdown-src", + "flake-compat": "flake-compat", "nixpkgs": [ + "devenv", + "cachix", "devenv", "nixpkgs" ], "nixpkgs-regression": "nixpkgs-regression" }, "locked": { - "lastModified": 1676545802, - "narHash": "sha256-EK4rZ+Hd5hsvXnzSzk2ikhStJnD63odF7SzsQ8CuSPU=", + "lastModified": 1708577783, + "narHash": "sha256-92xq7eXlxIT5zFNccLpjiP7sdQqQI30Gyui2p/PfKZM=", "owner": "domenkozar", "repo": "nix", - "rev": "7c91803598ffbcfe4a55c44ac6d49b2cf07a527f", + "rev": "ecd0af0c1f56de32cbad14daa1d82a132bf298f8", "type": "github" }, "original": { "owner": "domenkozar", - "ref": "relaxed-flakes", + "ref": "devenv-2.21", "repo": "nix", "type": "github" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "poetry2nix", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1688870561, + "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nix2container": { "inputs": { - "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_5" + "flake-utils": "flake-utils_7", + "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1708764364, - "narHash": "sha256-+pOtDvmuVTg0Gi58hKDUyrNla5NbyUvt3Xs3gLR0Fws=", + "lastModified": 1711883218, + "narHash": "sha256-XKHhQJ0tk/S/LbYJb31VVvZKWdb+uCFnvEuUQZJkP9o=", "owner": "nlewo", "repo": "nix2container", - "rev": "c891f90d2e3c48a6b33466c96e4851e0fc0cf455", + "rev": "2154ad0459abfa258edaab038b4716f474656e99", "type": "github" }, "original": { @@ -671,13 +860,37 @@ "type": "github" } }, + "nix_2": { + "inputs": { + "flake-compat": "flake-compat_5", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], + "nixpkgs-regression": "nixpkgs-regression_2" + }, + "locked": { + "lastModified": 1710500156, + "narHash": "sha256-zvCqeUO2GLOm7jnU23G4EzTZR7eylcJN+HJ5svjmubI=", + "owner": "domenkozar", + "repo": "nix", + "rev": "c5bbf14ecbd692eeabf4184cc8d50f79c2446549", + "type": "github" + }, + "original": { + "owner": "domenkozar", + "ref": "devenv-2.21", + "repo": "nix", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1678875422, - "narHash": "sha256-T3o6NcQPwXjxJMn2shz86Chch4ljXgZn746c2caGxd8=", + "lastModified": 1692808169, + "narHash": "sha256-x9Opq06rIiwdwGeK2Ykj69dNc2IvUH1fY55Wm7atwrE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "126f49a01de5b7e35a43fd43f891ecf6d3a51459", + "rev": "9201b5ff357e781bf014d0330d18555695df7ba8", "type": "github" }, "original": { @@ -690,11 +903,11 @@ "nixpkgs-lib": { "locked": { "dir": "lib", - "lastModified": 1709237383, - "narHash": "sha256-cy6ArO4k5qTx+l5o+0mL9f5fa86tYUX3ozE1S+Txlds=", + "lastModified": 1711703276, + "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1536926ef5621b09bba54035ae2bb6d806d72ac8", + "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089", "type": "github" }, "original": { @@ -739,23 +952,55 @@ "type": "github" } }, + "nixpkgs-regression_2": { + "locked": { + "lastModified": 1643052045, + "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", + "type": "github" + } + }, "nixpkgs-stable": { "locked": { - "lastModified": 1685801374, - "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c37ca420157f4abc31e26f436c1145f8951ff373", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-23.05", + "ref": "nixos-23.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-stable_2": { + "locked": { + "lastModified": 1704874635, + "narHash": "sha256-YWuCrtsty5vVZvu+7BchAxmcYzTMfolSPP5io8+WYCg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.11", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-stable_3": { "locked": { "lastModified": 1673800717, "narHash": "sha256-SFHraUqLSu5cC6IxTprex/nTsI81ZQAtDvlBvGDWfnA=", @@ -771,7 +1016,7 @@ "type": "github" } }, - "nixpkgs-stable_3": { + "nixpkgs-stable_4": { "locked": { "lastModified": 1685801374, "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=", @@ -788,6 +1033,22 @@ } }, "nixpkgs_10": { + "locked": { + "lastModified": 1689261696, + "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_11": { "locked": { "lastModified": 1681358109, "narHash": "sha256-eKyxW4OohHQx9Urxi7TQlFBTDWII+F+x2hklDOQPB50=", @@ -803,7 +1064,7 @@ "type": "github" } }, - "nixpkgs_11": { + "nixpkgs_12": { "locked": { "lastModified": 1702272962, "narHash": "sha256-D+zHwkwPc6oYQ4G3A1HuadopqRwUY/JkMwHz1YF7j4Q=", @@ -819,13 +1080,13 @@ "type": "github" } }, - "nixpkgs_12": { + "nixpkgs_13": { "locked": { - "lastModified": 1710222005, - "narHash": "sha256-irXySffHz7b82dZIme6peyAu+8tTJr1zyxcfUPhqUrg=", + "lastModified": 1711593151, + "narHash": "sha256-/9NCoPI7fqJIN8viONsY9X0fAeq8jc3GslFCO0ky6TQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9a9a7552431c4f1a3b2eee9398641babf7c30d0e", + "rev": "bb2b73df7bcfbd2dd55ff39b944d70547d53c267", "type": "github" }, "original": { @@ -836,6 +1097,22 @@ } }, "nixpkgs_2": { + "locked": { + "lastModified": 1710236354, + "narHash": "sha256-vWrciFdq49vve43g4pbi7NjmL4cwG1ifXnQx+dU3T5E=", + "owner": "cachix", + "repo": "devenv-nixpkgs", + "rev": "829e73affeadfb4198a7105cbe3a03153d13edc9", + "type": "github" + }, + "original": { + "owner": "cachix", + "ref": "rolling", + "repo": "devenv-nixpkgs", + "type": "github" + } + }, + "nixpkgs_3": { "locked": { "lastModified": 1703013332, "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", @@ -851,7 +1128,7 @@ "type": "github" } }, - "nixpkgs_3": { + "nixpkgs_4": { "locked": { "lastModified": 1671271357, "narHash": "sha256-xRJdLbWK4v2SewmSStYrcLa0YGJpleufl44A19XSW8k=", @@ -867,7 +1144,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_5": { "locked": { "lastModified": 1704161960, "narHash": "sha256-QGua89Pmq+FBAro8NriTuoO/wNaUtugt29/qqA8zeeM=", @@ -883,7 +1160,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_6": { "locked": { "lastModified": 1697269602, "narHash": "sha256-dSzV7Ud+JH4DPVD9od53EgDrxUVQOcSj4KGjggCDVJI=", @@ -898,13 +1175,13 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_7": { "locked": { - "lastModified": 1710734606, - "narHash": "sha256-rFJl+WXfksu2NkWJWKGd5Km17ZGEjFg9hOQNwstsoU8=", + "lastModified": 1711715736, + "narHash": "sha256-9slQ609YqT9bT/MNX9+5k5jltL9zgpn36DpFB7TkttM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "79bb4155141a5e68f2bdee2bf6af35b1d27d3a1d", + "rev": "807c549feabce7eddbf259dbdcec9e0600a0660d", "type": "github" }, "original": { @@ -914,7 +1191,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_8": { "locked": { "lastModified": 1696193975, "narHash": "sha256-mnQjUcYgp9Guu3RNVAB2Srr1TqKcPpRXmJf4LJk6KRY=", @@ -930,7 +1207,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_9": { "locked": { "lastModified": 1696419054, "narHash": "sha256-EdR+dIKCfqL3voZUDYwcvgRDOektQB9KbhBVcE0/3Mo=", @@ -946,22 +1223,6 @@ "type": "github" } }, - "nixpkgs_9": { - "locked": { - "lastModified": 1689261696, - "narHash": "sha256-LzfUtFs9MQRvIoQ3MfgSuipBVMXslMPH/vZ+nM40LkA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "df1eee2aa65052a18121ed4971081576b25d6b5c", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "parts": { "inputs": { "nixpkgs-lib": [ @@ -984,26 +1245,49 @@ "type": "github" } }, - "pre-commit-hooks": { + "poetry2nix": { "inputs": { - "flake-compat": [ - "devenv", - "flake-compat" - ], "flake-utils": "flake-utils", + "nix-github-actions": "nix-github-actions", + "nixpkgs": [ + "devenv", + "cachix", + "devenv", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1692876271, + "narHash": "sha256-IXfZEkI0Mal5y1jr6IRWMqK8GW2/f28xJenZIPQqkY0=", + "owner": "nix-community", + "repo": "poetry2nix", + "rev": "d5006be9c2c2417dafb2e2e5034d83fabd207ee3", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "poetry2nix", + "type": "github" + } + }, + "pre-commit-hooks": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_2", "gitignore": "gitignore", "nixpkgs": [ "devenv", + "cachix", "nixpkgs" ], "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1704725188, - "narHash": "sha256-qq8NbkhRZF1vVYQFt1s8Mbgo8knj+83+QlL5LBnYGpI=", + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "ea96f0c05924341c551a797aaba8126334c505d2", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", "type": "github" }, "original": { @@ -1012,14 +1296,42 @@ "type": "github" } }, - "pre-commit-nix": { + "pre-commit-hooks_2": { "inputs": { - "flake-compat": "flake-compat_2", + "flake-compat": [ + "devenv", + "flake-compat" + ], "flake-utils": "flake-utils_3", "gitignore": "gitignore_2", - "nixpkgs": "nixpkgs_3", + "nixpkgs": [ + "devenv", + "nixpkgs" + ], "nixpkgs-stable": "nixpkgs-stable_2" }, + "locked": { + "lastModified": 1708018599, + "narHash": "sha256-M+Ng6+SePmA8g06CmUZWi1AjG2tFBX9WCXElBHEKnyM=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "5df5a70ad7575f6601d91f0efec95dd9bc619431", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "pre-commit-nix": { + "inputs": { + "flake-compat": "flake-compat_6", + "flake-utils": "flake-utils_5", + "gitignore": "gitignore_3", + "nixpkgs": "nixpkgs_4", + "nixpkgs-stable": "nixpkgs-stable_3" + }, "locked": { "lastModified": 1675169698, "narHash": "sha256-C1wFiyJ+4SRvIsFkdMIN1Fa+58APmyTGKWpX9EKOehM=", @@ -1036,11 +1348,11 @@ }, "pre-commit-nix_2": { "inputs": { - "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_6", - "gitignore": "gitignore_3", - "nixpkgs": "nixpkgs_9", - "nixpkgs-stable": "nixpkgs-stable_3" + "flake-compat": "flake-compat_7", + "flake-utils": "flake-utils_8", + "gitignore": "gitignore_4", + "nixpkgs": "nixpkgs_10", + "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { "lastModified": 1696516544, @@ -1105,7 +1417,7 @@ "neovim-nix": "neovim-nix", "nil": "nil", "nix2container": "nix2container", - "nixpkgs": "nixpkgs_6", + "nixpkgs": "nixpkgs_7", "sg-nvim": "sg-nvim", "vscode-js-debug": "vscode-js-debug", "zls": "zls" @@ -1154,8 +1466,8 @@ }, "rust-overlay_3": { "inputs": { - "flake-utils": "flake-utils_7", - "nixpkgs": "nixpkgs_10" + "flake-utils": "flake-utils_9", + "nixpkgs": "nixpkgs_11" }, "locked": { "lastModified": 1696558324, @@ -1175,7 +1487,7 @@ "inputs": { "flake-parts": "flake-parts_2", "nci": "nci", - "nixpkgs": "nixpkgs_8", + "nixpkgs": "nixpkgs_9", "pre-commit-nix": "pre-commit-nix_2", "rust-overlay": "rust-overlay_3" }, @@ -1231,6 +1543,21 @@ "type": "github" } }, + "systems_10": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "systems_2": { "locked": { "lastModified": 1681028828, @@ -1336,6 +1663,21 @@ "type": "github" } }, + "systems_9": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt": { "inputs": { "nixpkgs": [ @@ -1361,7 +1703,7 @@ "vscode-js-debug": { "inputs": { "dream2nix": "dream2nix_2", - "flake-utils": "flake-utils_8", + "flake-utils": "flake-utils_10", "nixpkgs": [ "vscode-js-debug", "dream2nix", @@ -1369,11 +1711,11 @@ ] }, "locked": { - "lastModified": 1708642103, - "narHash": "sha256-p75zOxEZdV51gNyxLPWOv4ZOAaXArktBjwItp+VfL3A=", + "lastModified": 1711388075, + "narHash": "sha256-qX3m3y1nJLASRH4txfeym+fc+fQpcgp2hS9NQHTv8OM=", "owner": "willruggiano", "repo": "vscode-js-debug.nix", - "rev": "1496a7a7c158baf900bcd2f2a99ff711dd64f807", + "rev": "b611410cd402aea4964c141af5d22785c035e27f", "type": "github" }, "original": { @@ -1384,19 +1726,19 @@ }, "zig-overlay": { "inputs": { - "flake-compat": "flake-compat_4", - "flake-utils": "flake-utils_10", + "flake-compat": "flake-compat_8", + "flake-utils": "flake-utils_12", "nixpkgs": [ "zls", "nixpkgs" ] }, "locked": { - "lastModified": 1710245298, - "narHash": "sha256-cEKS6ZMZgF+abBAlvEIUb3yd1q1qsDvD30CqZpNcFwU=", + "lastModified": 1711627798, + "narHash": "sha256-4BUZmgUFrrD5dRZbOUYRRQEDwLX/r7/ErLi+vHfB/+8=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "fc58d5337b5b47d83ed66e084f681a11b7657e69", + "rev": "b01e0b81d1fa489e54362ea0a74f182eaa9a35bb", "type": "github" }, "original": { @@ -1407,18 +1749,18 @@ }, "zls": { "inputs": { - "flake-utils": "flake-utils_9", - "gitignore": "gitignore_4", + "flake-utils": "flake-utils_11", + "gitignore": "gitignore_5", "langref": "langref", - "nixpkgs": "nixpkgs_12", + "nixpkgs": "nixpkgs_13", "zig-overlay": "zig-overlay" }, "locked": { - "lastModified": 1710703275, - "narHash": "sha256-1zb0z7NvpyR6KiM7kOcF9Ng0n7mNQViL+N0f88opj6I=", + "lastModified": 1711925513, + "narHash": "sha256-DFgsGlEGsxLgtRrh7J+v8x4w+/cJatTCkrZP3/0Gb/o=", "owner": "zigtools", "repo": "zls", - "rev": "0844c710348301cfd9634044abf153767f8102b8", + "rev": "4e01c08f558ea07462aaa7b71d2a24f86f47a855", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 4cc071e..a267446 100644 --- a/flake.nix +++ b/flake.nix @@ -43,15 +43,23 @@ ... }: { apps = { + ci.program = pkgs.writeShellApplication { + name = "ci.sh"; + text = '' + nix run .#update && + nix run .#push && + git commit -am 'chore: 🌶️🌶️🌶️' && git push + ''; + }; push.program = pkgs.writeShellApplication { name = "push.sh"; runtimeInputs = with pkgs; [cachix jq]; text = '' - nix flake archive --json \ + nix flake archive --accept-flake-config --json \ | jq -r '.path,(.inputs|to_entries[].value.path)' \ | cachix push willruggiano; - nix build --json \ + nix build --accept-flake-config --json \ | jq -r '.[].outputs | to_entries[].value' \ | cachix push willruggiano; @@ -62,7 +70,7 @@ name = "update.sh"; runtimeInputs = with pkgs; [niv]; text = '' - nix flake update && + nix flake update --accept-flake-config && niv update && nix run .#nvim-treesitter.update-grammars -- ./pkgs/nvim-treesitter ''; diff --git a/nix/sources.json b/nix/sources.json index 178f285..7153e17 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -14,7 +14,7 @@ "SchemaStore.nvim": { "branch": "main", "repo": "git@github.com:b0o/SchemaStore.nvim", - "rev": "4d798fd5b692c8fce77268aba8f6f926b0c9f835", + "rev": "cd06d5cf3eab123232b3c1d5b13b1869aa73d08a", "type": "git" }, "cargo-expand.nvim": { @@ -32,7 +32,7 @@ "clangd_extensions.nvim": { "branch": "main", "repo": "git@github.com:p00f/clangd_extensions.nvim", - "rev": "34c8eaa12be192e83cd4865ce2375e9f53e728f2", + "rev": "2992ba8c13c2de41f91a7c7488bf1c48bcec31fe", "type": "git" }, "cmp-buffer": { @@ -86,7 +86,7 @@ "conform.nvim": { "branch": "master", "repo": "git@github.com:stevearc/conform.nvim", - "rev": "41586cbc81b8d344a795264989a3db79d0a27615", + "rev": "9d5ba06d6ee7418c674f498634617416d15b6239", "type": "git" }, "cpsm": { @@ -122,7 +122,7 @@ "flit.nvim": { "branch": "main", "repo": "ssh://git@github.com/ggandor/flit.nvim", - "rev": "94419242ba07170b0009514d745e617b120964f4", + "rev": "04f744bbb2b91fb2ad2c702b5eb8e23d17924fa6", "type": "git" }, "fuzzy.nvim": { @@ -134,7 +134,7 @@ "fzf": { "branch": "master", "repo": "git@github.com:junegunn/fzf", - "rev": "d579e335b5aa30e98a2ec046cb782bbb02bc28ad", + "rev": "c30e486b648c1540a660802a5015aeca208274fa", "type": "git" }, "fzy-lua-native": { @@ -146,7 +146,7 @@ "gitsigns.nvim": { "branch": "main", "repo": "ssh://git@github.com/lewis6991/gitsigns.nvim", - "rev": "078041e9d060a386b0c9d3a8c7a7b019a35d3fb0", + "rev": "a4db718c78bff65198e3b63f1043f1e7bb5e05c8", "type": "git" }, "hover.nvim": { @@ -164,7 +164,7 @@ "iron.nvim": { "branch": "master", "repo": "git@github.com:vigemus/iron.nvim", - "rev": "7f876ee3e1f4ea1e5284b1b697cdad5b256e8046", + "rev": "0bedb945f4d9f10f36096deda62824bc48e1ec43", "type": "git" }, "karen-yank.nvim": { @@ -188,7 +188,7 @@ "leap.nvim": { "branch": "main", "repo": "ssh://git@github.com/ggandor/leap.nvim", - "rev": "74b2ed7a0fac2fedf191d673f2d0883aab3dfe9c", + "rev": "7a9407d17fab3a1c3cfe201965d680a408776152", "type": "git" }, "lir-git-status.nvim": { @@ -218,13 +218,13 @@ "lualine.nvim": { "branch": "master", "repo": "git@github.com:nvim-lualine/lualine.nvim", - "rev": "af4c3cf17206810880d2a93562e0a4c0d901c684", + "rev": "b5e8bb642138f787a2c1c5aedc2a78cb2cebbd67", "type": "git" }, "neo-tree.nvim": { "branch": "main", "repo": "git@github.com:nvim-neo-tree/neo-tree.nvim", - "rev": "403a9c5014624dc517b850a360f345340139307c", + "rev": "16d1b194376bf1fc2acd89ccb3c29ba8315bfcea", "type": "git" }, "nui.nvim": { @@ -242,13 +242,13 @@ "nvim-bqf": { "branch": "main", "repo": "ssh://git@github.com/kevinhwang91/nvim-bqf", - "rev": "b51a37fcd808edafd52511458467c8c9a701ea8d", + "rev": "52703d7adc3be3f7c09eea9a80c5b8caa615fb25", "type": "git" }, "nvim-cmp": { "branch": "main", "repo": "git@github.com:hrsh7th/nvim-cmp", - "rev": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782", + "rev": "ce16de5665c766f39c271705b17fff06f7bcb84f", "type": "git" }, "nvim-colorizer.lua": { @@ -260,13 +260,13 @@ "nvim-dap": { "branch": "master", "repo": "ssh://git@github.com/mfussenegger/nvim-dap", - "rev": "c1695e500c7d552a0a19953a9aefcc89178fb1af", + "rev": "405df1dcc2e395ab5173a9c3d00e03942c023074", "type": "git" }, "nvim-dap-ui": { "branch": "master", "repo": "ssh://git@github.com/rcarriga/nvim-dap-ui", - "rev": "13888eb35faaba48efaf49130b83e0d12e042e1b", + "rev": "edfa93f60b189e5952c016eee262d0685d838450", "type": "git" }, "nvim-dap-virtual-text": { @@ -302,13 +302,13 @@ "nvim-lspconfig": { "branch": "master", "repo": "git@github.com:neovim/nvim-lspconfig", - "rev": "8c1831817d40925d22cd8a555296c44c02fdaaf5", + "rev": "f4619ab31fc4676001ea05ae8200846e6e7700c7", "type": "git" }, "nvim-nio": { "branch": "master", "repo": "git@github.com:nvim-neotest/nvim-nio", - "rev": "ed70af8ad9d4dafdb55539ed2b4454aac2a2a0c3", + "rev": "173f285eebb410199273fa178aa517fd2d7edd80", "type": "git" }, "nvim-nonicons": { @@ -350,31 +350,31 @@ "nvim-treesitter": { "branch": "master", "repo": "ssh://git@github.com/nvim-treesitter/nvim-treesitter", - "rev": "2014f8285e306f4c8a896c7d3af53fdd599e5a4f", + "rev": "54cf9180a36299265e217858e6e531245074c3f4", "type": "git" }, "nvim-treesitter-textobjects": { "branch": "master", "repo": "ssh://git@github.com/nvim-treesitter/nvim-treesitter-textobjects", - "rev": "d2a4ffc22d9d38d44edb73da007b3cf43451e9b4", + "rev": "0b826f843f1079b9f0aba41f2a5cb7612e6b3329", "type": "git" }, "nvim-ts-context-commentstring": { "branch": "main", "repo": "git@github.com:JoosepAlviste/nvim-ts-context-commentstring", - "rev": "7ab799a9792f7cf3883cf28c6a00ad431f3d382a", + "rev": "734ebad31c81c6198dfe102aa23280937c937c42", "type": "git" }, "nvim-web-devicons": { "branch": "master", "repo": "ssh://git@github.com/kyazdani42/nvim-web-devicons", - "rev": "cb0c967c9723a76ccb1be0cc3a9a10e577d2f6ec", + "rev": "3ee60deaa539360518eaab93a6c701fe9f4d82ef", "type": "git" }, "overseer.nvim": { "branch": "master", "repo": "git@github.com:stevearc/overseer.nvim", - "rev": "b72f6d23ce47ccd427be2341f389c63448278f17", + "rev": "b04b0b105c07b4f02b3073ea3a98d6eca90bf152", "type": "git" }, "package-info.nvim": { @@ -386,7 +386,7 @@ "plenary.nvim": { "branch": "master", "repo": "ssh://git@github.com/nvim-lua/plenary.nvim", - "rev": "f7adfc4b3f4f91aab6caebf42b3682945fbc35be", + "rev": "8aad4396840be7fc42896e3011751b7609ca4119", "type": "git" }, "popfix": { @@ -440,7 +440,7 @@ "telescope-manix": { "branch": "master", "repo": "git@github.com:mrcjkb/telescope-manix", - "rev": "1ca5ba5ef8e60c2f844cf0b6a581716895762877", + "rev": "b61eaf260d02da734228e0d54c3999b9b8340d5e", "type": "git" }, "telescope-symbols.nvim": { @@ -458,7 +458,7 @@ "telescope.nvim": { "branch": "master", "repo": "git@github.com:nvim-telescope/telescope.nvim", - "rev": "c816406bd50ade6ec754474f08974154487d417c", + "rev": "4626aaa2bcfdacf55fd6d44b430e2df81b2403ff", "type": "git" }, "toggleterm.nvim": { @@ -500,7 +500,7 @@ "vim-dadbod-ui": { "branch": "master", "repo": "git@github.com:kristijanhusak/vim-dadbod-ui", - "rev": "165699c573469e6a95b48d35052f848c340c5911", + "rev": "066922699bdf1c6e14d517b844454b12b93ce25a", "type": "git" }, "vim-dispatch": { diff --git a/pkgs/nvim-treesitter/grammars/c.json b/pkgs/nvim-treesitter/grammars/c.json index 3627bfd..f6947bb 100644 --- a/pkgs/nvim-treesitter/grammars/c.json +++ b/pkgs/nvim-treesitter/grammars/c.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "371fd0bf0650581b6e49f06f438c88c419859696", - "date": "2024-03-12T20:32:37-04:00", - "path": "/nix/store/cwiqjmm19gw3xyccpd5hjw0k3nl40xmy-tree-sitter-c-371fd0b", - "sha256": "0a7y33hwyvsq2kn8il9xz0bcizwq6qai2fzdspjxjfkck5pzi8fd", - "hash": "sha256-zaH4b5lsOtnl1e07ERU2mP/IFvg90YjsFFhvz+EY/ig=", + "rev": "72084f447c2051e01a7cd6c6e0477ec71a9297ed", + "date": "2024-03-20T20:53:10-04:00", + "path": "/nix/store/8hs8v5n536q6xmxyks4rncbdvqwyaz1c-tree-sitter-c-72084f4", + "sha256": "1yl6ywvigqk9lmcwi3hblk19ziaxsx8sm8ify796zv5y8iqrchrk", + "hash": "sha256-M0OWcUS+7G/S8S6iqlHXXcWfwqQLjshZpWniFzf3hvo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/cmake.json b/pkgs/nvim-treesitter/grammars/cmake.json index 44fc7af..b63cfda 100644 --- a/pkgs/nvim-treesitter/grammars/cmake.json +++ b/pkgs/nvim-treesitter/grammars/cmake.json @@ -1,10 +1,10 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "ce71cae5e022f0fa9031f067673d139d8e9dd63e", - "date": "2024-03-17T19:23:49+02:00", - "path": "/nix/store/vj0ijsx8l31z5ap55421fik1aqnf7kf5-tree-sitter-cmake-ce71cae", - "sha256": "0w2lyva6wa88p4mav6y8qln63xmnl2zfx84g106m26d4q6s7fc31", - "hash": "sha256-YTB3tMGkGVENCI+g7r6gtvZhLMXIm60quQgpbtT2VHA=", + "rev": "20ffd6d3b4da1acdbf2d08204b2130a5b2f7c4b3", + "date": "2024-03-19T09:50:27+02:00", + "path": "/nix/store/lxhm5lvr9h0yjsg3jggbsmaxmg7ym59w-tree-sitter-cmake-20ffd6d", + "sha256": "16klinbjr9k5piwqvfvl48wmprk9wlypqnmihryy2wj2m2xzlyqa", + "hash": "sha256-Cnv6u6hCcuF9hrFafD3laeZbOSJ0u415vGWmLJeNdJo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/haskell.json b/pkgs/nvim-treesitter/grammars/haskell.json index 106cfb9..f54ca3b 100644 --- a/pkgs/nvim-treesitter/grammars/haskell.json +++ b/pkgs/nvim-treesitter/grammars/haskell.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "6b5ec205c9d4f23eb36a163f1edc4f2db8c98e4a", - "date": "2024-02-26T15:02:24+01:00", - "path": "/nix/store/bnjpmia4vhsj5cn128yz910x80qlz0bl-tree-sitter-haskell-6b5ec20", - "sha256": "1d3klbflb1xl234s6pw874j1d5r82bkx5jdi7il1irfvhgdkjljc", - "hash": "sha256-TFI524Pb5RhoPLHJ0ucSKJcWJDmIX6PJELSHRd2ic7Q=", + "rev": "95a4f0023741b3bee0cc500f3dab9c5bab2dc2be", + "date": "2024-03-24T15:47:21+01:00", + "path": "/nix/store/nld0kbs4s21nx1mdb9jhpdrsckcmvl9b-tree-sitter-haskell-95a4f00", + "sha256": "0kwbknxk8f6824bijqqkmlfg04074v31ava8qsf97bqsgs6039vf", + "hash": "sha256-bqcBjH4ar5OcxkhtFcYmBxDwHK0TYxkXEcg4NLudi08=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/html.json b/pkgs/nvim-treesitter/grammars/html.json index 448d019..c7acf91 100644 --- a/pkgs/nvim-treesitter/grammars/html.json +++ b/pkgs/nvim-treesitter/grammars/html.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-html", - "rev": "b285e25c1ba8729399ce4f15ac5375cf6c3aa5be", - "date": "2024-03-13T13:32:09-07:00", - "path": "/nix/store/fqqyndk9w599ymcwxcrc2p78ryvwzrpv-tree-sitter-html-b285e25", - "sha256": "1vg6g2qd6b2hrzflmc8rlkmslx2xw3haasy1cg2jpdapc6mm40bc", - "hash": "sha256-bAFSq2FXtSvFY8FrpeDgXXSq66QZsUrdz1As07B45u0=", + "rev": "bfa075d83c6b97cd48440b3829ab8d24a2319809", + "date": "2024-03-26T09:02:04-04:00", + "path": "/nix/store/vwm6c3y7qv9qsxs2v68r17qysvjijqcw-tree-sitter-html-bfa075d", + "sha256": "1yy2qpmia0nlbv3hv031rqzvb7ilgcnsqz4mxmds4n547xxxqind", + "hash": "sha256-zUbcez+kWKJb7ZV8rC17NJ61P85hgA3HXtQCFevFwvs=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/java.json b/pkgs/nvim-treesitter/grammars/java.json index a4776a9..62d49c3 100644 --- a/pkgs/nvim-treesitter/grammars/java.json +++ b/pkgs/nvim-treesitter/grammars/java.json @@ -1,10 +1,10 @@ { "url": "https://github.com/tree-sitter/tree-sitter-java", - "rev": "5e62fbb519b608dfd856000fdc66536304c414de", - "date": "2024-03-10T11:06:54-04:00", - "path": "/nix/store/2xv75zgqrzvcg9s5pxcl4453cifj5as2-tree-sitter-java-5e62fbb", - "sha256": "1pjq3sg0f9id8fwivkzdmbillcr0a2zpf1ckdm1q6q7ksasvwj2s", - "hash": "sha256-Wki+tdLzYINDbZMFd79QIDNK46rtzx25Qy0mB54eWN4=", + "rev": "2aae502017d3aed587ba85e3c7e0cbc138f3e07a", + "date": "2024-03-23T20:43:54-04:00", + "path": "/nix/store/6hqh1bh266pgmxs2d5y7569fkgiilfg3-tree-sitter-java-2aae502", + "sha256": "1ajaqvm547k6m5rrjb0awh06gb1xlkx2y97di8wysvkg1c6jjcsk", + "hash": "sha256-UzMpDQtvbu05iu0kL/qkPaxnAOQKLJlzqWYeUurGSqo=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/markdown.json b/pkgs/nvim-treesitter/grammars/markdown.json index a0bac60..851253b 100644 --- a/pkgs/nvim-treesitter/grammars/markdown.json +++ b/pkgs/nvim-treesitter/grammars/markdown.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "b2f01981a76e3251f5b660378136c248ed106b81", - "date": "2024-03-13T23:51:05+02:00", - "path": "/nix/store/5p70fvhy7vsxgzy29sb6iwqk5zqna0b9-tree-sitter-markdown-b2f0198", - "sha256": "183ig6p39wzlmb8vz5hyjr4787s03b8gsw5p210qxkl3xs46s37a", - "hash": "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA=", + "rev": "44017499c51cb6431635ed51d5080e1fd05c2c21", + "date": "2024-03-23T12:27:10+01:00", + "path": "/nix/store/wy21i50ykpgrcv05db0gacc8aji88hvv-tree-sitter-markdown-4401749", + "sha256": "1n9kf2kvqrj9s0fd5nhy31l4g8cbzzvjihsvch301rcm7dy1xbv7", + "hash": "sha256-Z68efDuV5QAGZFvDKPf/i6FHaBge2tIc0ElmvKdwM9k=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/markdown_inline.json b/pkgs/nvim-treesitter/grammars/markdown_inline.json index a0bac60..851253b 100644 --- a/pkgs/nvim-treesitter/grammars/markdown_inline.json +++ b/pkgs/nvim-treesitter/grammars/markdown_inline.json @@ -1,10 +1,10 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "b2f01981a76e3251f5b660378136c248ed106b81", - "date": "2024-03-13T23:51:05+02:00", - "path": "/nix/store/5p70fvhy7vsxgzy29sb6iwqk5zqna0b9-tree-sitter-markdown-b2f0198", - "sha256": "183ig6p39wzlmb8vz5hyjr4787s03b8gsw5p210qxkl3xs46s37a", - "hash": "sha256-6gxtiO6Dzo5BELdw/dAaQB90SJYelr/RqvTzNK55caA=", + "rev": "44017499c51cb6431635ed51d5080e1fd05c2c21", + "date": "2024-03-23T12:27:10+01:00", + "path": "/nix/store/wy21i50ykpgrcv05db0gacc8aji88hvv-tree-sitter-markdown-4401749", + "sha256": "1n9kf2kvqrj9s0fd5nhy31l4g8cbzzvjihsvch301rcm7dy1xbv7", + "hash": "sha256-Z68efDuV5QAGZFvDKPf/i6FHaBge2tIc0ElmvKdwM9k=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/query.json b/pkgs/nvim-treesitter/grammars/query.json index 0aa9b2f..3c934a8 100644 --- a/pkgs/nvim-treesitter/grammars/query.json +++ b/pkgs/nvim-treesitter/grammars/query.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nvim-treesitter/tree-sitter-query", - "rev": "176a380df78800167565118bb0dadfc961abbd43", - "date": "2024-03-07T12:57:53+02:00", - "path": "/nix/store/16qhx9whj4ajiv2vvh33m8drknp110qq-tree-sitter-query-176a380", - "sha256": "0w0f3zymch27s923j4wkxjn2rfgf2qrhsrcrxf56nxmsgbbkdlvg", - "hash": "sha256-b9M213q6dmuK65llDTMW7rksrOyTEzlE0kdAVv0fDnA=", + "rev": "2e31ca2771f6042b0e4e0c41a6290014a9e1face", + "date": "2024-03-26T11:42:51+02:00", + "path": "/nix/store/lh8qbx4qaqn9f31667ppycgrd2mcpib9-tree-sitter-query-2e31ca2", + "sha256": "0g8234yicidpjqc1rc7dvpx5ja49g938w451796nnn02chxa204i", + "hash": "sha256-kQChOmQCWGtNOqEQjkZ6iShZ+t3tsBwYlrdFFj0ZAj0=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/vimdoc.json b/pkgs/nvim-treesitter/grammars/vimdoc.json index e28387d..e330c02 100644 --- a/pkgs/nvim-treesitter/grammars/vimdoc.json +++ b/pkgs/nvim-treesitter/grammars/vimdoc.json @@ -1,10 +1,10 @@ { "url": "https://github.com/neovim/tree-sitter-vimdoc", - "rev": "cee98887944bfe979c95386785ae388d8ecb3715", - "date": "2024-03-17T13:28:36+01:00", - "path": "/nix/store/w6h2bnhkfiy4kimz046laacb1xv6mdvp-tree-sitter-vimdoc-cee9888", - "sha256": "07hiad9fb23cmjffjsgqyvj8fn4qnmalgf7pk6p3jvcg68fl942i", - "hash": "sha256-UZBEHTKPbTmumfe4R1W1mFiH5Pb4aemcrGyI5VJTER4=", + "rev": "a75a932449675bbd260213a95f4cd8b3193286f0", + "date": "2024-03-23T17:17:48+01:00", + "path": "/nix/store/lh4r5rnb998ha0014b2wp1594imvi473-tree-sitter-vimdoc-a75a932", + "sha256": "1nyi1zjxn21rdsvmn7rx53x0c6x4v810i19gbanfwqs3as3zr65j", + "hash": "sha256-spj8h1ZDY+6sWi+FCALapBsG+ig9H1u3bjkI2+UP0ds=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/nvim-treesitter/grammars/yaml.json b/pkgs/nvim-treesitter/grammars/yaml.json index 0691845..8d6c761 100644 --- a/pkgs/nvim-treesitter/grammars/yaml.json +++ b/pkgs/nvim-treesitter/grammars/yaml.json @@ -1,10 +1,10 @@ { "url": "https://github.com/ikatyang/tree-sitter-yaml", - "rev": "9e59b9bbf839ba231fbcb953617d8b9b9a059e38", - "date": "2024-03-14T03:58:30-04:00", - "path": "/nix/store/2b39id0scfm98hz17fdl9zrfmifma6zq-tree-sitter-yaml-9e59b9b", - "sha256": "19b56w3p65489x0fzqkpi9vr1z3rcl5p587vf8hzwldhnc95g1gm", - "hash": "sha256-9YVXErOwUf4hcvugcgtlefyQd4p34u9AT4gUcwc3ZaU=", + "rev": "10c6c7a69dde767ad229e1510e0c1c7aacd8c83a", + "date": "2024-03-27T10:31:32+01:00", + "path": "/nix/store/ydz09d6pkhksbc1i7v0403c5mmnksvvd-tree-sitter-yaml-10c6c7a", + "sha256": "1rx458yi0y8pwp5r0gsbvfj3707w3cqyln3zn306swjc3swgn0dw", + "hash": "sha256-vAH7uB5Mcm3AsH9Y6jEb/IAzpNtLP5DL5Rd5ED0qpOc=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false,