diff --git a/home/common/nvim/default.nix b/home/common/nvim/default.nix index b5599db..9f991b0 100644 --- a/home/common/nvim/default.nix +++ b/home/common/nvim/default.nix @@ -60,7 +60,7 @@ } { - plugin = pkgs.blink-cmp; + plugin = blink-cmp; type = "lua"; config = '' require'blink-cmp'.setup({ diff --git a/pkgs/blink-cmp/default.nix b/pkgs/blink-cmp/default.nix deleted file mode 100644 index e9307e4..0000000 --- a/pkgs/blink-cmp/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - lib, - rustPlatform, - fetchFromGitHub, - stdenv, - vimUtils, -}: -let - version = "0.7.3"; - src = fetchFromGitHub { - owner = "Saghen"; - repo = "blink.cmp"; - rev = "refs/tags/v${version}"; - hash = "sha256-nxiODLKgGeXzN5sqkLWU0PcsuSSB1scSzTC5qyCxLCI="; - }; - libExt = if stdenv.hostPlatform.isDarwin then "dylib" else "so"; - blink-fuzzy-lib = rustPlatform.buildRustPackage { - inherit version src; - pname = "blink-fuzzy-lib"; - env = { - # TODO: remove this if plugin stops using nightly rust - RUSTC_BOOTSTRAP = true; - }; - useFetchCargoVendor = true; - cargoHash = "sha256-XXI2jEoD6XbFNk3O8B6+aLzl1ZcJq1VinQXb+AOw8Rw="; - }; -in -vimUtils.buildVimPlugin { - pname = "blink-cmp"; - inherit version src; - preInstall = '' - mkdir -p target/release - ln -s ${blink-fuzzy-lib}/lib/libblink_cmp_fuzzy.${libExt} target/release/libblink_cmp_fuzzy.${libExt} - ''; - meta = { - description = "Performant, batteries-included completion plugin for Neovim"; - homepage = "https://github.com/saghen/blink.cmp"; - maintainers = with lib.maintainers; [ - balssh - redxtech - ]; - }; - doInstallCheck = true; - nvimRequireCheck = "blink-cmp"; -} diff --git a/pkgs/default.nix b/pkgs/default.nix index 1ee0f62..ab3485b 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,4 @@ pkgs: { - blink-cmp = pkgs.callPackage ./blink-cmp { }; gnome-ssh-askpass4 = pkgs.callPackage ./gnome-ssh-askpass4 { }; jujutsu-openssh = pkgs.callPackage ./jujutsu-openssh { }; lazyjj = pkgs.callPackage ./lazyjj { };