flake.lock

@@ -427,11 +427,11 @@
     },
     "nix-secrets": {
       "locked": {
-        "lastModified": 1730130467,
+        "lastModified": 1729849584,
-        "narHash": "sha256-mcyG1iu8hNmkDjgDEdFQyCZ3bBxBHFKd4nxT8NreMmY=",
+        "narHash": "sha256-byrCBtIcqFLEUoLCAli5g4w1allf4kPrxFV7+3jenCI=",
         "ref": "refs/heads/master",
-        "rev": "c82ff6f7e995503acabb9cf2478e5b4e401968ce",
+        "rev": "97c60da5f7e750b8d4cdcaacee4dfab393cabb94",
-        "revCount": 188,
+        "revCount": 187,
         "type": "git",
         "url": "ssh://git@git.bitlab21.com/sam/nix-secrets.git"
       },
@@ -549,11 +549,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1729945968,
+        "lastModified": 1729100089,
-        "narHash": "sha256-4u+nbBSMuXWGCtXxUPPEflRm54+y/HLIbhIep9do8Ew=",
+        "narHash": "sha256-B44+e/cYjrzgaDvCNz9TyHQy0q9Q6WaDISV57jxejJ8=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "c05ac01070425ed0797b1ff678dc690c333cea74",
+        "rev": "341dbb1b5867adb95d75e6dabef6627eb0eae38e",
         "type": "github"
       },
       "original": {

home/common/core/default.nix

@@ -1,4 +1,4 @@
-{ pkgs, inputs, outputs, lib, ... }:
+{ pkgs, inputs, outputs, ... }:
 {
   imports = [
     inputs.nix-colors.homeManagerModules.default

home/common/core/nixvim/default.nix

@@ -28,7 +28,6 @@
   ];
   programs.nixvim = {
     enable = true;
-    package = pkgs.unstable.neovim-unwrapped;
     enableMan = true; # install man pages for nixvim options
     clipboard.register = "unnamedplus"; # use system clipboard instead of internal registers
     globals.mapleader = " ";

home/common/core/nixvim/plugins/default.nix

@@ -1,18 +1,10 @@
 {
   pkgs,
   config,
-  lib,
-  inputs,
   ...
 }: let
   user = config.home.username;
-  mistralAPIKey = lib.optionalString (lib.hasAttr "sops-nix" inputs) config.sops.secrets."mistral-api-key".path;
 in {
-  sops.secrets = {
-    "mistral-api-key" = {
-    };
-  };
-
   imports = [
     ./cmp.nix
     ./colorizer.nix
@@ -40,18 +32,6 @@ in {
     pkgs.vimPlugins.vim-dadbod-ui
     pkgs.vimPlugins.vim-dadbod-completion
     pkgs.vimPlugins.fugitive
-
-    (pkgs.vimUtils.buildVimPlugin
-      {
-        name = "parrot.nvim";
-        src = pkgs.fetchFromGitHub {
-          owner = "frankroeder";
-          repo = "parrot.nvim";
-          rev = "c992483";
-          sha256 = "sha256-P899qNY/h5LTW0pp3sAmcSDsDGWQedXa20J7EggL7F8=";
-        };
-      })
-
     (pkgs.vimUtils.buildVimPlugin
       {
         name = "buffer_manager.nvim";
@@ -78,18 +58,6 @@ in {
     pkgs.vimPlugins.vim-devicons
   ];
   programs.nixvim.extraConfigLua = ''
-    -- function to read api key from secrets file
-     local function read_api_key(file_path)
-     	local file = io.open(file_path, "r")
-     	if file then
-     		local api_key = file:read("*all")
-     		file:close()
-     		return api_key
-     	else
-     		error("Failed to open file: " .. file_path)
-     	end
-     end
-
     -- buffer_manager.nvim
     local opts = {noremap = true}
 
@@ -155,71 +123,5 @@ in {
       end
       require("conform").format({ async = true, lsp_format = "fallback", range = range })
     end, { range = true })
-
-    -- parrot.nvim setup
-    require("parrot").setup {
-       toggle_target = "popup",
-       providers = {
-         mistral = {
-           api_key = read_api_key("${mistralAPIKey}"),
-           params = {
-             chat = { temperature = 0, top_p = 1, max_tokens = 16384 },
-             command = { temperature = 0, top_p = 1, max_tokens = 16384 },
-           },
-           -- api_key = os.getenv "MISTRAL_API_KEY",
-         },
-       },
-    hooks = {
-      AskCoder = function(prt, params)
-        local prompt = [[
-          You are a code assistent. Answer my question carefully and concisely.
-          Answer with code snippets only. Do not give a summary or include any
-          code comments in your response. Never repeate code from a prevous
-          response or write obvious or unnecessary code, instead refer to such
-          code like: "**rest of code here**", or something to that effect.
-          Tokens are expensive, to we need to be very consice.  If you uses
-          excessive tokens, then I will send you the invoice to pay the bill.
-          Question: {{command}}
-          ```
-        ]]
-        prt.ChatNew(params, prompt)
-      end,
-
-      AskCoderSel = function(parrot, params)
-        local template = [[
-          You are an expert programmer. Here is a code snippet along with a
-          question. Give me a short, accurate and consice answer.
-
-          ```{{filetype}}
-          {{selection}}
-          ```
-        ]]
-        local model_obj = parrot.get_model("command")
-        parrot.logger.info("Asking model: " .. model_obj.name)
-        parrot.Prompt(params, parrot.ui.Target.popup, model_obj, "🤖 Ask ~ ", template)
-      end,
-
-      GitCommit = function(parrot, params)
-          local template = [[
-              You are a git commit generator. You will be provided with a git diff file.
-              Your role is to create a concise commit message that outlines all of the
-              most relevant and impactful changes in the diff. You only output a commit
-              message, do not write anything else not related to the commit. Use
-              imperative mood for you writing style. Your message should include a
-              short summary in the first line followed by more detailed descriptions of
-              the changes on subsequent lines. The first line summary should be no more
-              than 70 characters, not end with a period, and a blank line should
-              separate the summary from the body of the message. There should only be 1
-              summary line, and 1 body with the description. The body should include no
-              more than 3 bullet points with more detailed descriptions of the files
-              and functions that have been modified. Do not output any code.
-              Diff: {{selection}}
-          ]]
-          local model_obj = parrot.get_model("command")
-          parrot.logger.info("Asking model: " .. model_obj.name)
-          parrot.Prompt(params, parrot.ui.Target.popup, model_obj, nil, template)
-        end,
-          }
-     }
   '';
 }