ringofstorms/nvim
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove avante

Browse source
This commit is contained in:
RingOfStorms (Joshua Bell) 2025-06-10 08:03:44 -05:00
parent 3d57156a38
commit 47104ea033
3 changed files with 126 additions and 133 deletions
Download patch file Download diff file Expand all files Collapse all files

17
flake.lock generated
View file

@ -863,22 +863,6 @@
"type": "github"
}
},
"nvim_plugin-yetone/avante.nvim": {
"flake": false,
"locked": {
"lastModified": 1749541623,
"narHash": "sha256-6zVk1MmiNBxzsBd2sbSXpMlIrM9IBvJarSBt+fmXYBY=",
"owner": "yetone",
"repo": "avante.nvim",
"rev": "e2b34f6435edcb9ef0a051ddcf24693a5d8bba2b",
"type": "github"
},
"original": {
"owner": "yetone",
"repo": "avante.nvim",
"type": "github"
}
},
"nvim_plugin-zbirenbaum/copilot-cmp": {
"flake": false,
"locked": {
@ -967,7 +951,6 @@
"nvim_plugin-tpope/vim-surround": "nvim_plugin-tpope/vim-surround",
"nvim_plugin-uga-rosa/ccc.nvim": "nvim_plugin-uga-rosa/ccc.nvim",
"nvim_plugin-windwp/nvim-ts-autotag": "nvim_plugin-windwp/nvim-ts-autotag",
"nvim_plugin-yetone/avante.nvim": "nvim_plugin-yetone/avante.nvim",
"nvim_plugin-zbirenbaum/copilot-cmp": "nvim_plugin-zbirenbaum/copilot-cmp",
"nvim_plugin-zbirenbaum/copilot.lua": "nvim_plugin-zbirenbaum/copilot.lua",
"rust-overlay": "rust-overlay"

118
flake.nix
View file

@ -114,8 +114,8 @@
"nvim_plugin-zbirenbaum/copilot.lua".flake = false;
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim".url = "github:CopilotC-Nvim/CopilotChat.nvim";
"nvim_plugin-CopilotC-Nvim/CopilotChat.nvim".flake = false;
"nvim_plugin-yetone/avante.nvim".url = "github:yetone/avante.nvim";
"nvim_plugin-yetone/avante.nvim".flake = false;
# "nvim_plugin-yetone/avante.nvim".url = "github:yetone/avante.nvim";
# "nvim_plugin-yetone/avante.nvim".flake = false;
# "nvim_plugin-HakonHarnes/img-clip.nvim".url = "github:HakonHarnes/img-clip.nvim";
# "nvim_plugin-HakonHarnes/img-clip.nvim".flake = false;
"nvim_plugin-stevearc/dressing.nvim".url = "github:stevearc/dressing.nvim";
@ -175,43 +175,43 @@
"nvim_plugin-nvim-treesitter/nvim-treesitter" = nvim-treesitter.withAllGrammars;
};
avante-nvim-lib = pkgs.rustPlatform.buildRustPackage {
pname = "avante-nvim-lib";
version = "0.0.0";
src = inputs."nvim_plugin-yetone/avante.nvim";
buildFeatures = [ "luajit" ];
doCheck = false;
cargoLock = {
lockFile = inputs."nvim_plugin-yetone/avante.nvim" + "/Cargo.lock";
allowBuiltinFetchGit = true;
};
nativeBuildInputs = with pkgs; [
pkg-config
];
buildInputs = with pkgs; [
openssl.dev
];
env = {
OPENSSL_NO_VENDOR = "1";
OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include";
OPENSSL_DIR = "${pkgs.openssl.dev}";
};
postInstall = ''
# mv $out/lib/libavante_repo_map.so $out/lib/avante_repo_map.so
for f in $out/lib/lib*; do
mv "$f" "$out/lib/''${f##*/lib}"
done
'';
meta = {
description = "Avante nvim libraries";
homepage = "https://github.com/yetone/avante.nvim";
license = pkgs.lib.licenses.asl20;
};
};
# avante-nvim-lib = pkgs.rustPlatform.buildRustPackage {
# pname = "avante-nvim-lib";
# version = "0.0.0";
# src = inputs."nvim_plugin-yetone/avante.nvim";
#
# buildFeatures = [ "luajit" ];
# doCheck = false;
# cargoLock = {
# lockFile = inputs."nvim_plugin-yetone/avante.nvim" + "/Cargo.lock";
# allowBuiltinFetchGit = true;
# };
#
# nativeBuildInputs = with pkgs; [
# pkg-config
# ];
#
# buildInputs = with pkgs; [
# openssl.dev
# ];
# env = {
# OPENSSL_NO_VENDOR = "1";
# OPENSSL_LIB_DIR = "${pkgs.openssl.out}/lib";
# OPENSSL_INCLUDE_DIR = "${pkgs.openssl.dev}/include";
# OPENSSL_DIR = "${pkgs.openssl.dev}";
# };
# postInstall = ''
# # mv $out/lib/libavante_repo_map.so $out/lib/avante_repo_map.so
# for f in $out/lib/lib*; do
# mv "$f" "$out/lib/''${f##*/lib}"
# done
# '';
# meta = {
# description = "Avante nvim libraries";
# homepage = "https://github.com/yetone/avante.nvim";
# license = pkgs.lib.licenses.asl20;
# };
# };
# This will be how we put any nix related stuff into our lua config
luaNixGlobal =
@ -299,7 +299,9 @@
}
)).overrideAttrs
(old: {
generatedWrapperArgs = old.generatedWrapperArgs or [ ] ++ [
generatedWrapperArgs =
old.generatedWrapperArgs or [ ]
++ [
# Add runtime dependencies to neovim path
"--prefix"
"PATH"
@ -310,24 +312,30 @@
"PATH"
":"
"${lib.makeBinPath defaultRuntimeDependencies}"
]
++ [
# Set the LAZY env path to the nix store, see init.lua for how it is used
"--set"
"LAZY"
"${lazyPath}"
# Link avante libraries
"--prefix"
"LD_LIBRARY_PATH"
":"
"${avante-nvim-lib}/lib"
# Add Lua C modules path TODO make these conditional so on linux, and dylib for mac it shouldn't be both...
"--prefix"
"LUA_CPATH"
";"
"${avante-nvim-lib}/lib/?.so"
"--prefix"
"LUA_CPATH"
";"
"${avante-nvim-lib}/lib/?.dylib"
]
# ++ [
# # Link avante libraries
# "--prefix"
# "LD_LIBRARY_PATH"
# ":"
# "${avante-nvim-lib}/lib"
# # Add Lua C modules path TODO make these conditional so on linux, and dylib for mac it shouldn't be both...
# "--prefix"
# "LUA_CPATH"
# ";"
# "${avante-nvim-lib}/lib/?.so"
# "--prefix"
# "LUA_CPATH"
# ";"
# "${avante-nvim-lib}/lib/?.dylib"
# ]
++ [
# Don't use default directories to not collide with another neovim config
# All things at runtime should be deletable since we are using nix to handle downloads and bins
# so I've chosen to put everything into the local state directory.
@ -359,6 +367,8 @@
fi
fi
''
]
++ [
# Clear proxy environment variables
"--unset"
"http_proxy"

0
lua/plugins/avante.lua → lua/plugins_disabled/avante.lua
View file