diff --git a/flake.nix b/flake.nix index 6a0af06f..55019a1e 100644 --- a/flake.nix +++ b/flake.nix @@ -117,6 +117,24 @@ # }; # }) + # TODO: Remove this after 0.15.1 hit nixpkgs + (final: prev: { + neovide = prev.neovide.overrideAttrs (finalAttrs: prevAttrs: { + version = "0.15.1"; + src = prev.fetchFromGitHub { + owner = "neovide"; + repo = "neovide"; + tag = finalAttrs.version; + hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI="; + }; + cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo="; + cargoDeps = prev.rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname src version; + hash = finalAttrs.cargoHash; + }; + }); + }) + # All my own overlays (import ./overlays {inherit nixpkgs inputs;}) ]; diff --git a/home/modules/neovim/default.nix b/home/modules/neovim/default.nix index ce0b0f99..eb11b4cc 100644 --- a/home/modules/neovim/default.nix +++ b/home/modules/neovim/default.nix @@ -25,23 +25,7 @@ in { packages = with pkgs; builtins.concatLists [ - (lib.optionals neovim.neovide [ - # TODO: Remove this after 0.15.1 hit nixpkgs - (neovide.overrideAttrs (finalAttrs: prevAttrs: { - version = "0.15.1"; - src = fetchFromGitHub { - owner = "neovide"; - repo = "neovide"; - tag = finalAttrs.version; - hash = "sha256-2iV3g6tcCkMF7sFG/GZDz3czPZNIDi6YLfrVzYO9jYI="; - }; - cargoHash = "sha256-YlHAcUCRk6ROg5yXIumHfsiR/2TrsSzbuXz/IQK7sEo="; - cargoDeps = pkgs.rustPlatform.fetchCargoVendor { - inherit (finalAttrs) pname src version; - hash = finalAttrs.cargoHash; - }; - })) - ]) + (lib.optionals neovim.neovide [neovide]) [ (pkgs.ripgrep.override {withPCRE2 = true;})