summaryrefslogtreecommitdiff
path: root/nvim
diff options
context:
space:
mode:
Diffstat (limited to 'nvim')
-rw-r--r--nvim/ginit.vim4
-rw-r--r--nvim/init.vim16
2 files changed, 15 insertions, 5 deletions
diff --git a/nvim/ginit.vim b/nvim/ginit.vim
index a79795b..dc40609 100644
--- a/nvim/ginit.vim
+++ b/nvim/ginit.vim
@@ -1,5 +1,5 @@
-if exists("g:fvim_loaded")
+if exists("g:fvim_loaded") || exists("g:nvy")
set guifont=LiterationMono\ Nerd\ Font\ Mono:h18
nnoremap <A-CR> :FVimToggleFullScreen<CR>
FVimCursorSmoothMove v:true
@@ -8,3 +8,5 @@ if exists("g:fvim_loaded")
nnoremap <C-=> :FVimBackgroundComposition 'none'<CR>:FVimBackgroundOpacity 1<CR>
FVimCustomTitleBar v:true
endif
+
+
diff --git a/nvim/init.vim b/nvim/init.vim
index 82291a7..09dd212 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -319,7 +319,7 @@ endif
" mason.nvim - lsp running
lua require("mason").setup()
-lua require("mason-lspconfig").setup({ensure_installed = {"lua_ls","harper-ls"}})
+"lua require("mason-lspconfig").setup({ensure_installed = {"lua_ls","harper-ls"}})
lua << EOF
local cmp = require("cmp")
@@ -424,16 +424,24 @@ do
require("lualine").setup({sections = {lualine_x = {get_status_icon, ollama_loaded}}})
require("ollama").config.prompts.fgen = {
prompt = [[
-Generate $ftype code that follows this code, keep any comments:
+Generate $ftype code that keeps all comments and follows this code:
-$sel
+```
+$before
+```
+
+and could go before this code
+
+```
+$after
+```
Respond EXACTLY in this format:
```$ftype
<your code>
```
]],
- action = "insert"
+ action = "display_insert"
}
require("ollama").config.prompts.extend= {
prompt = [[