From 9a66c102413a31c0b651cb3db66d0e278dcafcad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Moritz=20B=C3=B6hme?= Date: Sun, 15 Sep 2024 15:31:39 +0200 Subject: [PATCH] feat(nvim): move avante to own file and use openai --- modules/programs/nvim/new_plugins/avante.nix | 33 +++++++++++++++++++ modules/programs/nvim/new_plugins/other.nix | 22 +------------ secrets/openai.age | Bin 0 -> 597 bytes secrets/secrets.nix | 1 + 4 files changed, 35 insertions(+), 21 deletions(-) create mode 100644 modules/programs/nvim/new_plugins/avante.nix create mode 100644 secrets/openai.age diff --git a/modules/programs/nvim/new_plugins/avante.nix b/modules/programs/nvim/new_plugins/avante.nix new file mode 100644 index 0000000..1bf5c89 --- /dev/null +++ b/modules/programs/nvim/new_plugins/avante.nix @@ -0,0 +1,33 @@ +{ config, lib, pkgs, inputs, ... }: + +let + inherit (lib) mkEnableOption mkIf readFile; +in +{ + home-manager.users.moritz.programs.nixvim = { + extraPlugins = [ + (pkgs.vimUtils.buildVimPlugin { + pname = "avante.nvim"; + src = inputs.avante-nvim; + version = lib.my.mkVersionInput inputs.avante-nvim; + }) + pkgs.vimPlugins.nui-nvim + ]; + extraConfigLuaPost = '' + require("avante").setup({ + provider = "openai", + auto_suggestions_provider = "openai", + openai = { + api_key_name = "cmd:cat /run/agenix/openai" + } + }) + ''; + plugins.copilot-lua.enable = true; + plugins.copilot-lua.suggestion.enabled = false; + plugins.copilot-lua.panel.enabled = false; + plugins.dressing.enable = true; + performance.combinePlugins.standalonePlugins = [ "copilot.lua" ]; + }; + age.secrets."openai".file = ../../../../secrets/openai.age; + age.secrets."openai".owner = "moritz"; +} diff --git a/modules/programs/nvim/new_plugins/other.nix b/modules/programs/nvim/new_plugins/other.nix index 479cd38..b5d91a1 100644 --- a/modules/programs/nvim/new_plugins/other.nix +++ b/modules/programs/nvim/new_plugins/other.nix @@ -145,27 +145,7 @@ in { plugins.friendly-snippets.enable = true; } { plugins.direnv.enable = true; } { plugins.crates-nvim.enable = true; } - { - extraPlugins = [ - (pkgs.vimUtils.buildVimPlugin { - pname = "avante.nvim"; - src = inputs.avante-nvim; - version = lib.my.mkVersionInput inputs.avante-nvim; - }) - pkgs.vimPlugins.nui-nvim - ]; - extraConfigLuaPost = '' - require("avante").setup({ - provider = "copilot", - auto_suggestions_provider = "copilot", - }) - ''; - plugins.copilot-lua.enable = true; - plugins.copilot-lua.suggestion.enabled = false; - plugins.copilot-lua.panel.enabled = false; - plugins.dressing.enable = true; - performance.combinePlugins.standalonePlugins = [ "copilot.lua" ]; - } + ]; }; } diff --git a/secrets/openai.age b/secrets/openai.age new file mode 100644 index 0000000000000000000000000000000000000000..32ad5627d4d7edf245d1419c96c9fbedc491fc64 GIT binary patch literal 597 zcmYdHPt{G$OD?J`D9Oyv)5|YP*Do{V(zR14F3!+RO))YxHMCT4&MGZTb5tlZ(f6w; zE%mjC$SFz<_VG(JOV2QJbjmUEOw1_vHb_g!O3m^#56v>DFySgq^fbuz4#-Ul_fFII zcPhyYG%Q+=_RBWDOma3gml9yI)QC5}d%4Jkuo*R{HnQq|fnUNcjms8*qVUigb z91-Rp;%lN`X5p7-W>Dyzt6gk}VOvyWig{GJLRwy6R$zItg=45kMWS|Yc#fN6rgMp_ znX!wjWlBYIsdi3zXRB&FAiBXtevVoDmQF^&gxNDJT zc%*^9r?G1>*SV?nXC9|C^&Ea{$78M~m{qa(FZB8q4Jls>5|H|~~f=%6b&Z}5$(AoX_TD^If)|Fe0D;$EqK0E7a z<#+d^RkgTks!B{+$2^9XJx+7%nwFi=4|~+7oVWG$j?J9*d)gknn$CD%#69EAjJP{r zRX9)0C~e+7y`yf?EZbnY{4=#7ueY8J5PY!iw(#-qYn1d9detZ9q|Dm1@}9|Ap|jS9 NV}l!C6szZL0RXF;