diff --git a/candy/lua/marshmallow/init.lua b/candy/lua/marshmallow/init.lua index b17e539..fb9340d 100644 --- a/candy/lua/marshmallow/init.lua +++ b/candy/lua/marshmallow/init.lua @@ -2,7 +2,6 @@ require("marshmallow.colorscheme") require("marshmallow.defaults") require("marshmallow.statusline") require("marshmallow.remap") -require("marshmallow.treesitter") require("marshmallow.lsp") require("marshmallow.snippets") diff --git a/candy/lua/marshmallow/treesitter.lua b/candy/lua/marshmallow/treesitter.lua deleted file mode 100644 index 7592aa4..0000000 --- a/candy/lua/marshmallow/treesitter.lua +++ /dev/null @@ -1,5 +0,0 @@ -require("nvim-treesitter.configs").setup({ - highlight = { - enable = true, - }, -}) diff --git a/flake.lock b/flake.lock index d5be3cb..3641158 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", + "lastModified": 1764011051, + "narHash": "sha256-M7SZyPZiqZUR/EiiBJnmyUbOi5oE/03tCeFrTiUZchI=", "owner": "numtide", "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", + "rev": "17ed8d9744ebe70424659b0ef74ad6d41fc87071", "type": "github" }, "original": { @@ -19,44 +19,12 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { - "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_3": { - "locked": { - "lastModified": 1746162366, - "narHash": "sha256-5SSSZ/oQkwfcAz/o/6TlejlVGqeK08wyREBQ5qFFPhM=", + "lastModified": 1761640442, + "narHash": "sha256-AtrEP6Jmdvrqiv4x2xa5mrtaIp3OEe8uBYCDZDS+hu8=", "owner": "nix-community", "repo": "flake-compat", - "rev": "0f158086a2ecdbb138cd0429410e44994f1b7e4b", + "rev": "4a56054d8ffc173222d09dad23adf4ba946c8884", "type": "github" }, "original": { @@ -72,11 +40,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -93,11 +61,11 @@ ] }, "locked": { - "lastModified": 1760948891, - "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", + "lastModified": 1768135262, + "narHash": "sha256-PVvu7OqHBGWN16zSi6tEmPwwHQ4rLPU9Plvs8/1TUBY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", + "rev": "80daad04eddbbf5a4d883996a73f3f542fa437ac", "type": "github" }, "original": { @@ -106,59 +74,14 @@ "type": "github" } }, - "git-hooks": { - "inputs": { - "flake-compat": "flake-compat_2", - "gitignore": "gitignore", - "nixpkgs": [ - "nightly", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760663237, - "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", - "owner": "cachix", - "repo": "git-hooks.nix", - "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", - "type": "github" - }, - "original": { - "owner": "cachix", - "repo": "git-hooks.nix", - "type": "github" - } - }, - "gitignore": { - "inputs": { - "nixpkgs": [ - "nightly", - "git-hooks", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1709087332, - "narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=", - "owner": "hercules-ci", - "repo": "gitignore.nix", - "rev": "637db329424fd7e46cf4185293b9cc8c88c95394", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "gitignore.nix", - "type": "github" - } - }, "harpoon-nvim": { "flake": false, "locked": { - "lastModified": 1739222527, - "narHash": "sha256-L7FvOV6KvD58BnY3no5IudiKTdgkGqhpS85RoSxtl7U=", + "lastModified": 1761924951, + "narHash": "sha256-qQSPVMdldksNZDPZvnTiXxty+GSUqMGz8nYEFDRezrQ=", "owner": "ThePrimeagen", "repo": "harpoon", - "rev": "ed1f853847ffd04b2b61c314865665e1dadf22c7", + "rev": "87b1a3506211538f460786c23f98ec63ad9af4e5", "type": "github" }, "original": { @@ -168,39 +91,14 @@ "type": "github" } }, - "hercules-ci-effects": { - "inputs": { - "flake-parts": [ - "nightly", - "flake-parts" - ], - "nixpkgs": [ - "nightly", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758022363, - "narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=", - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "rev": "1a3667d33e247ad35ca250698d63f49a5453d824", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "hercules-ci-effects", - "type": "github" - } - }, "neovim-src": { "flake": false, "locked": { - "lastModified": 1761000337, - "narHash": "sha256-fBz9U/k/YWoS4QgcoQ54NKDEopTdL2zI0gzLlWv/xR8=", + "lastModified": 1768521207, + "narHash": "sha256-hUv++WImk6JCwEGhn9Gv+lDk2kbP/LA6t/n4KT676Ic=", "owner": "neovim", "repo": "neovim", - "rev": "b67eff38fe19876ab228007897224ec04b58aa40", + "rev": "43339dee40aa7731cc644315c15080e30aa1a67c", "type": "github" }, "original": { @@ -211,20 +109,16 @@ }, "nightly": { "inputs": { - "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "git-hooks": "git-hooks", - "hercules-ci-effects": "hercules-ci-effects", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_2", - "treefmt-nix": "treefmt-nix" + "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761005134, - "narHash": "sha256-9bSlfRleXFl50M6AnurWr1oKDTk3uF5DaTVHxeds0CY=", + "lastModified": 1768521890, + "narHash": "sha256-pliWebSDPrqqUdUPQhoPjhXDzP6jtTOrtG0N9obIY9A=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "3a6201e41d13f1a73b2e2c734dbd36b4c42584b0", + "rev": "46edfd3b2ed593edd8a4fc94018ef8ae2065c352", "type": "github" }, "original": { @@ -235,11 +129,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722073938, - "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", + "lastModified": 1762156382, + "narHash": "sha256-Yg7Ag7ov5+36jEFC1DaZh/12SEXo6OO3/8rqADRxiqs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", + "rev": "7241bcbb4f099a66aafca120d37c65e8dda32717", "type": "github" }, "original": { @@ -251,11 +145,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760934318, - "narHash": "sha256-/oUYsC0lUCBory65VK+UHqCCsCspbL1Vgfcf1KUYqVw=", + "lastModified": 1768395095, + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "87848bf0cc4f87717fc813a4575f07330c3e743c", + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", "type": "github" }, "original": { @@ -267,11 +161,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1760965567, - "narHash": "sha256-0JDOal5P7xzzAibvD0yTE3ptyvoVOAL0rcELmDdtSKg=", + "lastModified": 1768395095, + "narHash": "sha256-ZhuYJbwbZT32QA95tSkXd9zXHcdZj90EzHpEXBMabaw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cb82756ecc37fa623f8cf3e88854f9bf7f64af93", + "rev": "13868c071cc73a5e9f610c47d7bb08e5da64fdd5", "type": "github" }, "original": { @@ -311,7 +205,7 @@ }, "tolerable": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat", "nightly": [ "nightly" ], @@ -320,40 +214,19 @@ ] }, "locked": { - "lastModified": 1761013436, - "narHash": "sha256-nFAcPUohW75fSeHjHMAI+dZZvfdHoqxs6bUThR+6Nvk=", - "owner": "wires-org", + "lastModified": 1768445642, + "narHash": "sha256-Dd7NCBgVZjm9rSqBJoyd1Rgs39Fv4+sVnhwB8Rt6HV4=", + "owner": "mrshmllow", "repo": "tolerable-nvim-nix", - "rev": "178d5612aecb0215618d35c7fb80ab15908c618b", + "rev": "d7b57701976684de456d02038720bc648251054d", "type": "github" }, "original": { - "owner": "wires-org", + "owner": "mrshmllow", "repo": "tolerable-nvim-nix", "type": "github" } }, - "treefmt-nix": { - "inputs": { - "nixpkgs": [ - "nightly", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1760945191, - "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", - "owner": "numtide", - "repo": "treefmt-nix", - "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "treefmt-nix", - "type": "github" - } - }, "vim-firestore": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 5b0226b..96e35fa 100644 --- a/flake.nix +++ b/flake.nix @@ -8,7 +8,7 @@ inputs.devshell.url = "github:numtide/devshell"; inputs.nightly.url = "github:nix-community/neovim-nightly-overlay"; - inputs.tolerable.url = "github:wires-org/tolerable-nvim-nix"; + inputs.tolerable.url = "github:mrshmllow/tolerable-nvim-nix"; inputs.tolerable.inputs.nixpkgs.follows = "nixpkgs"; inputs.tolerable.inputs.nightly.follows = "nightly";