From 90e20b21686d6ddd5a212e2e1b8a3b272778f418 Mon Sep 17 00:00:00 2001 From: doylet Date: Tue, 9 Apr 2024 16:08:17 +1000 Subject: [PATCH] Update how we handle mingw and building --- Internal/os_nvim_init.vim | 65 +++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 12 deletions(-) diff --git a/Internal/os_nvim_init.vim b/Internal/os_nvim_init.vim index a7febe8..4fafb23 100644 --- a/Internal/os_nvim_init.vim +++ b/Internal/os_nvim_init.vim @@ -37,6 +37,8 @@ call plug#begin(stdpath('config') . '/plugged') Plug 'hrsh7th/cmp-buffer' Plug 'hrsh7th/cmp-path' Plug 'VonHeikemen/lsp-zero.nvim', {'branch': 'v3.x'} + + Plug 'huggingface/llm.nvim' " lsp-zero end call plug#end() @@ -54,7 +56,22 @@ lua <', '', {noremap = true}) + vim.o.makeprg = "./build.sh" + end + vim.api.nvim_set_keymap('n', '', ':Make', {noremap = true}) + + -- LSP Setup ///////////////////////////////////////////////////////////////////////////////////// local lsp_zero = require('lsp-zero') lsp_zero.on_attach(function(client, bufnr) -- see :help lsp-zero-keybindings @@ -105,6 +122,41 @@ lua <" }, -- tokens to remove from the model's output + -- -- parameters that are added to the request body, values are arbitrary, you can set any field:value pair here it will be passed as is to the backend + -- request_body = { }, + -- -- set this if the model supports fill in the middle + -- fim = { + -- enabled = true, + -- prefix = "
 ",
+  --     middle  = " ",
+  --     suffix  = " ",
+  --   },
+  --   debounce_ms              = 150,
+  --   accept_keymap            = "",
+  --   dismiss_keymap           = "",
+  --   tls_skip_verify_insecure = false,
+  --   -- llm-ls configuration, cf llm-ls section
+  --   lsp = {
+  --     bin_path = "C:/Home/Downloads/llm-ls.exe",
+  --     host     = nil,
+  --     port     = nil,
+  --   },
+  --   tokenizer                     = {
+  --     path = "C:/Home/Models/codellama-7b_tokenizer.json",
+  --   },  -- cf Tokenizer paragraph
+  --   context_window                = 4096, -- max number of tokens for the context window
+  --   enable_suggestions_on_startup = true,
+  --   enable_suggestions_on_files   = "*",  -- pattern matching syntax to enable suggestions on specific files, either a string or a list of strings
+  -- })
+
   -- Harpoon =======================================================================================
   local harpoon = require('harpoon')
   harpoon:setup()
@@ -312,14 +364,3 @@ nnoremap s :vs
 " Go to previous error
 nnoremap  :cn
 nnoremap  :cp
-
-" Vim Dispatch =====================================================================================
-let s:running_windows = has("win16") || has("win32") || has("win64")
-if s:running_windows
-    set makeprg=build.bat
-else
-    " Set vim terminal to enter normal mode using escape like normal vim behaviour
-    tnoremap  
-    set makeprg=./build.sh
-endif
-nnoremap  :Make