neovim

chore: update

+38 -171
-1
candy/lua/marshmallow/init.lua
··· 2 2 require("marshmallow.defaults") 3 3 require("marshmallow.statusline") 4 4 require("marshmallow.remap") 5 - require("marshmallow.treesitter") 6 5 require("marshmallow.lsp") 7 6 require("marshmallow.snippets") 8 7
-5
candy/lua/marshmallow/treesitter.lua
··· 1 - require("nvim-treesitter.configs").setup({ 2 - highlight = { 3 - enable = true, 4 - }, 5 - })
+37 -164
flake.lock
··· 5 5 "nixpkgs": "nixpkgs" 6 6 }, 7 7 "locked": { 8 - "lastModified": 1741473158, 9 - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", 8 + "lastModified": 1764011051, 9 + "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", 10 10 "owner": "numtide", 11 11 "repo": "devshell", 12 - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", 12 + "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", 13 13 "type": "github" 14 14 }, 15 15 "original": { ··· 19 19 } 20 20 }, 21 21 "flake-compat": { 22 - "flake": false, 23 22 "locked": { 24 - "lastModified": 1747046372, 25 - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", 26 - "owner": "edolstra", 27 - "repo": "flake-compat", 28 - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", 29 - "type": "github" 30 - }, 31 - "original": { 32 - "owner": "edolstra", 33 - "repo": "flake-compat", 34 - "type": "github" 35 - } 36 - }, 37 - "flake-compat_2": { 38 - "flake": false, 39 - "locked": { 40 - "lastModified": 1747046372, 41 - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", 42 - "owner": "edolstra", 43 - "repo": "flake-compat", 44 - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", 45 - "type": "github" 46 - }, 47 - "original": { 48 - "owner": "edolstra", 49 - "repo": "flake-compat", 50 - "type": "github" 51 - } 52 - }, 53 - "flake-compat_3": { 54 - "locked": { 55 - "lastModified": 1746162366, 56 - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", 23 + "lastModified": 1761640442, 24 + "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", 57 25 "owner": "nix-community", 58 26 "repo": "flake-compat", 59 - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", 27 + "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884", 60 28 "type": "github" 61 29 }, 62 30 "original": { ··· 72 40 ] 73 41 }, 74 42 "locked": { 75 - "lastModified": 1760948891, 76 - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", 43 + "lastModified": 1768135262, 44 + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", 77 45 "owner": "hercules-ci", 78 46 "repo": "flake-parts", 79 - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", 47 + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", 80 48 "type": "github" 81 49 }, 82 50 "original": { ··· 93 61 ] 94 62 }, 95 63 "locked": { 96 - "lastModified": 1760948891, 97 - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", 64 + "lastModified": 1768135262, 65 + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", 98 66 "owner": "hercules-ci", 99 67 "repo": "flake-parts", 100 - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", 68 + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", 101 69 "type": "github" 102 70 }, 103 71 "original": { 104 72 "owner": "hercules-ci", 105 73 "repo": "flake-parts", 106 - "type": "github" 107 - } 108 - }, 109 - "git-hooks": { 110 - "inputs": { 111 - "flake-compat": "flake-compat_2", 112 - "gitignore": "gitignore", 113 - "nixpkgs": [ 114 - "nightly", 115 - "nixpkgs" 116 - ] 117 - }, 118 - "locked": { 119 - "lastModified": 1760663237, 120 - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", 121 - "owner": "cachix", 122 - "repo": "git-hooks.nix", 123 - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", 124 - "type": "github" 125 - }, 126 - "original": { 127 - "owner": "cachix", 128 - "repo": "git-hooks.nix", 129 - "type": "github" 130 - } 131 - }, 132 - "gitignore": { 133 - "inputs": { 134 - "nixpkgs": [ 135 - "nightly", 136 - "git-hooks", 137 - "nixpkgs" 138 - ] 139 - }, 140 - "locked": { 141 - "lastModified": 1709087332, 142 - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", 143 - "owner": "hercules-ci", 144 - "repo": "gitignore.nix", 145 - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", 146 - "type": "github" 147 - }, 148 - "original": { 149 - "owner": "hercules-ci", 150 - "repo": "gitignore.nix", 151 74 "type": "github" 152 75 } 153 76 }, 154 77 "harpoon-nvim": { 155 78 "flake": false, 156 79 "locked": { 157 - "lastModified": 1739222527, 158 - "narHash": "sha256-L7FvOV6KvD58BnY3no5IudiKTdgkGqhpS85RoSxtl7U=", 80 + "lastModified": 1761924951, 81 + "narHash": "sha256-qQSPVMdldksNZDPZvnTiXxty+GSUqMGz8nYEFDRezrQ=", 159 82 "owner": "ThePrimeagen", 160 83 "repo": "harpoon", 161 - "rev": "ed1f853847ffd04b2b61c314865665e1dadf22c7", 84 + "rev": "87b1a3506211538f460786c23f98ec63ad9af4e5", 162 85 "type": "github" 163 86 }, 164 87 "original": { ··· 168 91 "type": "github" 169 92 } 170 93 }, 171 - "hercules-ci-effects": { 172 - "inputs": { 173 - "flake-parts": [ 174 - "nightly", 175 - "flake-parts" 176 - ], 177 - "nixpkgs": [ 178 - "nightly", 179 - "nixpkgs" 180 - ] 181 - }, 182 - "locked": { 183 - "lastModified": 1758022363, 184 - "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", 185 - "owner": "hercules-ci", 186 - "repo": "hercules-ci-effects", 187 - "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", 188 - "type": "github" 189 - }, 190 - "original": { 191 - "owner": "hercules-ci", 192 - "repo": "hercules-ci-effects", 193 - "type": "github" 194 - } 195 - }, 196 94 "neovim-src": { 197 95 "flake": false, 198 96 "locked": { 199 - "lastModified": 1761000337, 200 - "narHash": "sha256-fBz9U/k/YWoS4QgcoQ54NKDEopTdL2zI0gzLlWv/xR8=", 97 + "lastModified": 1768521207, 98 + "narHash": "sha256-hUv++WImk6JCwEGhn9Gv+lDk2kbP/LA6t/n4KT676Ic=", 201 99 "owner": "neovim", 202 100 "repo": "neovim", 203 - "rev": "b67eff38fe19876ab228007897224ec04b58aa40", 101 + "rev": "43339dee40aa7731cc644315c15080e30aa1a67c", 204 102 "type": "github" 205 103 }, 206 104 "original": { ··· 211 109 }, 212 110 "nightly": { 213 111 "inputs": { 214 - "flake-compat": "flake-compat", 215 112 "flake-parts": "flake-parts_2", 216 - "git-hooks": "git-hooks", 217 - "hercules-ci-effects": "hercules-ci-effects", 218 113 "neovim-src": "neovim-src", 219 - "nixpkgs": "nixpkgs_2", 220 - "treefmt-nix": "treefmt-nix" 114 + "nixpkgs": "nixpkgs_2" 221 115 }, 222 116 "locked": { 223 - "lastModified": 1761005134, 224 - "narHash": "sha256-9bSlfRleXFl50M6AnurWr1oKDTk3uF5DaTVHxeds0CY=", 117 + "lastModified": 1768521890, 118 + "narHash": "sha256-pliWebSDPrqqUdUPQhoPjhXDzP6jtTOrtG0N9obIY9A=", 225 119 "owner": "nix-community", 226 120 "repo": "neovim-nightly-overlay", 227 - "rev": "3a6201e41d13f1a73b2e2c734dbd36b4c42584b0", 121 + "rev": "46edfd3b2ed593edd8a4fc94018ef8ae2065c352", 228 122 "type": "github" 229 123 }, 230 124 "original": { ··· 235 129 }, 236 130 "nixpkgs": { 237 131 "locked": { 238 - "lastModified": 1722073938, 239 - "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", 132 + "lastModified": 1762156382, 133 + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", 240 134 "owner": "NixOS", 241 135 "repo": "nixpkgs", 242 - "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", 136 + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", 243 137 "type": "github" 244 138 }, 245 139 "original": { ··· 251 145 }, 252 146 "nixpkgs_2": { 253 147 "locked": { 254 - "lastModified": 1760934318, 255 - "narHash": "sha256-/oUYsC0lUCBory65VK+UHqCCsCspbL1Vgfcf1KUYqVw=", 148 + "lastModified": 1768395095, 149 + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", 256 150 "owner": "NixOS", 257 151 "repo": "nixpkgs", 258 - "rev": "87848bf0cc4f87717fc813a4575f07330c3e743c", 152 + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", 259 153 "type": "github" 260 154 }, 261 155 "original": { ··· 267 161 }, 268 162 "nixpkgs_3": { 269 163 "locked": { 270 - "lastModified": 1760965567, 271 - "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", 164 + "lastModified": 1768395095, 165 + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", 272 166 "owner": "NixOS", 273 167 "repo": "nixpkgs", 274 - "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", 168 + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", 275 169 "type": "github" 276 170 }, 277 171 "original": { ··· 311 205 }, 312 206 "tolerable": { 313 207 "inputs": { 314 - "flake-compat": "flake-compat_3", 208 + "flake-compat": "flake-compat", 315 209 "nightly": [ 316 210 "nightly" 317 211 ], ··· 320 214 ] 321 215 }, 322 216 "locked": { 323 - "lastModified": 1761013436, 324 - "narHash": "sha256-nFAcPUohW75fSeHjHMAI+dZZvfdHoqxs6bUThR+6Nvk=", 325 - "owner": "wires-org", 217 + "lastModified": 1768445642, 218 + "narHash": "sha256-Dd7NCBgVZjm9rSqBJoyd1Rgs39Fv4+sVnhwB8Rt6HV4=", 219 + "owner": "mrshmllow", 326 220 "repo": "tolerable-nvim-nix", 327 - "rev": "178d5612aecb0215618d35c7fb80ab15908c618b", 221 + "rev": "d7b57701976684de456d02038720bc648251054d", 328 222 "type": "github" 329 223 }, 330 224 "original": { 331 - "owner": "wires-org", 225 + "owner": "mrshmllow", 332 226 "repo": "tolerable-nvim-nix", 333 - "type": "github" 334 - } 335 - }, 336 - "treefmt-nix": { 337 - "inputs": { 338 - "nixpkgs": [ 339 - "nightly", 340 - "nixpkgs" 341 - ] 342 - }, 343 - "locked": { 344 - "lastModified": 1760945191, 345 - "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", 346 - "owner": "numtide", 347 - "repo": "treefmt-nix", 348 - "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", 349 - "type": "github" 350 - }, 351 - "original": { 352 - "owner": "numtide", 353 - "repo": "treefmt-nix", 354 227 "type": "github" 355 228 } 356 229 },
+1 -1
flake.nix
··· 8 8 inputs.devshell.url = "github:numtide/devshell"; 9 9 inputs.nightly.url = "github:nix-community/neovim-nightly-overlay"; 10 10 11 - inputs.tolerable.url = "github:wires-org/tolerable-nvim-nix"; 11 + inputs.tolerable.url = "github:mrshmllow/tolerable-nvim-nix"; 12 12 inputs.tolerable.inputs.nixpkgs.follows = "nixpkgs"; 13 13 inputs.tolerable.inputs.nightly.follows = "nightly"; 14 14