From 94dabbbe898e0b62ca0fe2125a1bad6418ca8886 Mon Sep 17 00:00:00 2001 From: Simon Bruder Date: Fri, 24 Mar 2023 13:14:07 +0100 Subject: [PATCH] neovim: Remove vim-nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Most of its functionalty is now provided by tree-sitter. Also, it somehow causes errors for vimtex‽ --- pkgs/default.nix | 24 ------------------------ users/simon/modules/neovim/default.nix | 1 - 2 files changed, 25 deletions(-) diff --git a/pkgs/default.nix b/pkgs/default.nix index c3d71c9..3a7af5f 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -64,28 +64,4 @@ in patches = [ ]; }); - - vimPlugins = prev.vimPlugins // { - # TODO: Remove once (if?) https://github.com/LnL7/vim-nix/pull/28 lands - vim-nix = prev.vimPlugins.vim-nix.overrideAttrs (o: { - patches = o.patches or [ ] ++ (map prev.fetchpatch [ - { - url = "https://github.com/LnL7/vim-nix/commit/d298418ba10e1460b3b22106633731c2a9c1c83b.patch"; - sha256 = "sha256-JcSkHScZtEN7qLYKxQB3pasl98MBXVBilB1noLxJxb8="; - } - { - url = "https://github.com/LnL7/vim-nix/commit/7b26edee3e2f63cce096aff65cfdaf995ebd92b0.patch"; - sha256 = "sha256-sId/HOUfYf5U9S3HgSmOsldRiEbXc5mVFol7M7CMdi8="; - } - { - url = "https://github.com/LnL7/vim-nix/commit/7cad7f3666a63ff00f7ecd73a98886031901b918.patch"; - sha256 = "sha256-rSRPkCo1wLvyufQkOo3gOwHetxvLdI6L89r7UgApz54="; - } - { - url = "https://github.com/LnL7/vim-nix/commit/6affa2b211b02a907ab3bc7064821be57ae93446.patch"; - sha256 = "sha256-/fFx2/v2bGLAf5xQD+Y5p79NyRQu2dRFNoc9sYXoglM="; - } - ]); - }); - }; } diff --git a/users/simon/modules/neovim/default.nix b/users/simon/modules/neovim/default.nix index eca2e08..6e4ac59 100644 --- a/users/simon/modules/neovim/default.nix +++ b/users/simon/modules/neovim/default.nix @@ -95,7 +95,6 @@ in vim-fugitive vim-illuminate vim-markdown - vim-nix vim-openscad vim-snippets vimtex