From 71fe796589ce515ad0ed807453988ee4e21bd14c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Fri, 16 Feb 2024 11:02:46 +0100 Subject: [PATCH] refactor: move lsp-config --- modules/programs/nvim/default.nix | 15 --------------- modules/programs/nvim/plugins/coding.nix | 5 ++++- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index d425745..2879ae5 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -10,21 +10,6 @@ in options.my.programs.nvim.enable = mkEnableOption "nvim"; config = mkIf cfg.enable { - my.nixpkgs.overlays = [ - ( - _: prev: - with lib.my; - { - vimPlugins = prev.vimPlugins // { - # HACK: to fix error in nixpkgs version of nvim-lspconfig - nvim-lspconfig = prev.vimPlugins.nvim-lspconfig.overrideAttrs (_: { - version = mkVersionInput inputs.nvim-lspconfig; - src = inputs.nvim-lspconfig; - }); - }; - } - ) - ]; home-manager.users.moritz = { xdg.configFile."nvim/snippets" = { recursive = true; diff --git a/modules/programs/nvim/plugins/coding.nix b/modules/programs/nvim/plugins/coding.nix index ad647e8..8f43ca2 100644 --- a/modules/programs/nvim/plugins/coding.nix +++ b/modules/programs/nvim/plugins/coding.nix @@ -98,7 +98,10 @@ with builtins; lazy = false; } { - plugin = nvim-lspconfig; + plugin = pkgs.vimPlugins.nvim-lspconfig.overrideAttrs (_: { + version = lib.my.mkVersionInput inputs.nvim-lspconfig; + src = inputs.nvim-lspconfig; + }); event = [ "BufRead" "BufNewFile" ]; conf = readFile ./lua/nvim-lspconfig.lua; dependencies = [