diff --git a/configuration.nix b/configuration.nix index 9cce777a..cb0a2385 100644 --- a/configuration.nix +++ b/configuration.nix @@ -118,7 +118,6 @@ isMaximal: { fidget-nvim.enable = true; highlight-undo.enable = true; - blink-indent.enable = true; indent-blankline.enable = true; # Fun diff --git a/docs/manual/release-notes/rl-0.9.md b/docs/manual/release-notes/rl-0.9.md index 82cdeec4..c275b0d3 100644 --- a/docs/manual/release-notes/rl-0.9.md +++ b/docs/manual/release-notes/rl-0.9.md @@ -232,8 +232,6 @@ https://github.com/gorbit99/codewindow.nvim - Added [`grug-far.nvim`](https://github.com/MagicDuck/grug-far.nvim) the find and replace tool for neovim. - Fix lsp `client.supports_method` deprecation warning in nvim v0.12. -- Add [`blink.indent`](https://github.com/saghen/blink.indent) indent guidline - plugin. [Ladas552](https://github.com/Ladas552) diff --git a/flake/pkgs/by-name/blink-cmp/package.nix b/flake/pkgs/by-name/blink-cmp/package.nix index 7a7b01c6..df55de22 100644 --- a/flake/pkgs/by-name/blink-cmp/package.nix +++ b/flake/pkgs/by-name/blink-cmp/package.nix @@ -4,6 +4,7 @@ rustPlatform, fetchFromGitHub, rust-jemalloc-sys, + writeShellScriptBin, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "blink-cmp"; @@ -21,11 +22,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "info" ]; - # Tries to call git - preBuild = '' - rm build.rs - ''; - postInstall = '' cp -r {lua,plugin} "$out" @@ -48,6 +44,10 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-Qdt8O7IGj2HySb1jxsv3m33ZxJg96Ckw26oTEEyQjfs="; + nativeBuildInputs = [ + (writeShellScriptBin "git" "exit 1") + ]; + env = { RUSTC_BOOTSTRAP = true; diff --git a/modules/plugins/visuals/blink-indent/blink-indent.nix b/modules/plugins/visuals/blink-indent/blink-indent.nix deleted file mode 100644 index edac61f8..00000000 --- a/modules/plugins/visuals/blink-indent/blink-indent.nix +++ /dev/null @@ -1,9 +0,0 @@ -{lib, ...}: let - inherit (lib.options) mkEnableOption; - inherit (lib.nvim.types) mkPluginSetupOption; -in { - options.vim.visuals.blink-indent = { - enable = mkEnableOption "indentation guides [blink-indent]"; - setupOpts = mkPluginSetupOption "blink-indent" {}; - }; -} diff --git a/modules/plugins/visuals/blink-indent/config.nix b/modules/plugins/visuals/blink-indent/config.nix deleted file mode 100644 index 7a05e7fc..00000000 --- a/modules/plugins/visuals/blink-indent/config.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ - config, - lib, - ... -}: let - inherit (lib.modules) mkIf; - - cfg = config.vim.visuals.blink-indent; -in { - config = mkIf cfg.enable { - vim.lazy.plugins.blink-indent = { - package = "blink-indent"; - setupModule = "blink.indent"; - inherit (cfg) setupOpts; - - event = ["BufEnter"]; - }; - }; -} diff --git a/modules/plugins/visuals/blink-indent/default.nix b/modules/plugins/visuals/blink-indent/default.nix deleted file mode 100644 index b9f9083d..00000000 --- a/modules/plugins/visuals/blink-indent/default.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ - imports = [ - ./config.nix - ./blink-indent.nix - ]; -} diff --git a/modules/plugins/visuals/default.nix b/modules/plugins/visuals/default.nix index 228d8c43..f989b878 100644 --- a/modules/plugins/visuals/default.nix +++ b/modules/plugins/visuals/default.nix @@ -7,7 +7,6 @@ in { toggles under individual options. '') - ./blink-indent ./cellular-automaton ./cinnamon-nvim ./fidget-nvim diff --git a/npins/sources.json b/npins/sources.json index 05b662ff..38b14425 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -91,19 +91,6 @@ "url": "https://github.com/moyiz/blink-emoji.nvim/archive/f22ce8cac02a6ece05368220f1e38bd34fe376f9.tar.gz", "hash": "sha256-pPHESNsByHg2liNUYkUEVR1wP1MZcil1sKTqrNI53e4=" }, - "blink-indent": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "saghen", - "repo": "blink.indent" - }, - "branch": "main", - "submodules": false, - "revision": "9c80820ca77218a8d28e70075d6f44a1609911fe", - "url": "https://github.com/saghen/blink.indent/archive/9c80820ca77218a8d28e70075d6f44a1609911fe.tar.gz", - "hash": "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng=" - }, "blink-ripgrep-nvim": { "type": "Git", "repository": {