avante updates

This commit is contained in:
Ellis Rahhal 2025-03-14 19:36:35 -07:00
parent 6b8d249242
commit 2c61c9a043
6 changed files with 25 additions and 11 deletions

12
flake.lock generated
View file

@ -69,11 +69,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1741010256, "lastModified": 1741513245,
"narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -106,11 +106,11 @@
"nuschtosSearch": "nuschtosSearch" "nuschtosSearch": "nuschtosSearch"
}, },
"locked": { "locked": {
"lastModified": 1741098523, "lastModified": 1741709061,
"narHash": "sha256-gXDSXDr6tAb+JgxGMvcEjKC9YO8tVOd8hMMZHJLyQ6Q=", "narHash": "sha256-G1YTksB0CnVhpU1gEmvO3ugPS5CAmUpm5UtTIUIPnEI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "03065fd4708bfdf47dd541d655392a60daa25ded", "rev": "3a3abf11700f76738d8ad9d15054ceaf182d2974",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -2,6 +2,8 @@
description = "Opinionated Nixvim config as a flake"; description = "Opinionated Nixvim config as a flake";
inputs = { inputs = {
## nixvim uses it's own version, so this is only
## for explicitly installed packages and non nixvim config
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
nixvim = { nixvim = {

View file

@ -21,5 +21,6 @@
environment.interactiveShellInit = if config.nixvim-config.enable then '' environment.interactiveShellInit = if config.nixvim-config.enable then ''
alias vi='nvim' alias vi='nvim'
alias vim='nvim' alias vim='nvim'
alias vimdiff='nvim -d'
'' else ""; '' else "";
} }

View file

@ -1,4 +1,4 @@
{ config, ... }: { config, pkgs, ... }:
{ {
programs.nixvim = { programs.nixvim = {
enable = config.nixvim-config.enable; enable = config.nixvim-config.enable;
@ -88,10 +88,15 @@
## ------------------------------------------------ ## ------------------------------------------------
colorschemes.tokyonight.enable = true; colorschemes.tokyonight.enable = true;
# colorschemes.gruvbox.enable = true;
## Or: ## Or:
# extraPlugins = [ pkgs.vimPlugins.gruvbox ]; # extraPlugins = [ pkgs.vimPlugins.gruvbox ];
# colorscheme = "gruvbox"; # colorscheme = "gruvbox";
# extraConfigLua = ''
# -- Check if we're in diff mode
# if vim.opt.diff:get() then
# vim.cmd('gruvbox')
# end
# '';
}; };
} }

View file

@ -1,4 +1,4 @@
{ config, ... }: { config, pkgs, ... }:
{ {
programs.nixvim.plugins = if config.nixvim-config.enable-ai then { programs.nixvim.plugins = if config.nixvim-config.enable-ai then {
## required dependencies ## required dependencies
@ -16,6 +16,8 @@
avante = { avante = {
enable = true; enable = true;
package = pkgs.vimPlugins.avante-nvim;
settings = { settings = {
provider = "copilot"; provider = "copilot";
cursor_applying_provider = "copilot"; cursor_applying_provider = "copilot";

View file

@ -43,9 +43,13 @@
## disable, very annoying as notifications block content and ## disable, very annoying as notifications block content and
## are part of the buffer rotation ## are part of the buffer rotation
notify = { notify = {
enable = false; enable = true;
settings = { settings = {
top_down = false; top_down = false;
on_open = {
## Don't treat notify as a buffer
__raw = "function(win) vim.api.nvim_win_set_config(win, { focusable = false }) end";
};
}; };
}; };
## needed by avante. ## needed by avante.