Merge branch 'master' of https://github.com/julianobarbosa/kickstart.nvim.wip

init.lua

@@ -43,6 +43,11 @@ P.S. You can delete this when you're done too. It's your config now :)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
+vim.g.python3_host_prog = os.getenv 'HOME' .. '/.virtualenvs/neovim3/bin/python'
+vim.g.python_host_prog = os.getenv 'HOME' .. '/.virtualenvs/neovim3/bin/python3.10'
+
+-- The line beneath this is called `modeline`. See `:help modeline`
+-- vim: ts=2 sts=2 sw=2 et
 -- Install package manager
 --    https://github.com/folke/lazy.nvim
 --    `:help lazy.nvim.txt` for more info
@@ -505,7 +510,7 @@ mason_lspconfig.setup_handlers {
       settings = servers[server_name],
       filetypes = (servers[server_name] or {}).filetypes,
     }
-  end
+  end,
 }
 
 -- [[ Configure nvim-cmp ]]

lua/custom/plugins/chatgpt.lua

@@ -6,6 +6,12 @@ return {
       require("chatgpt").setup(
         {
           api_key_cmd = "pass show azure/hypera/oai/token",
+<<<<<<< HEAD
+=======
+          api_host_cmd = "pass show azure/hypera/oai/url",
+          predefined_chat_gpt_prompts =
+          "https://raw.githubusercontent.com/julianobarbosa/custom-gpt-prompts/main/prompt.csv"
+>>>>>>> 6e7efe1fd708281c9c1e215c554461ac76236ee5
         }
       )
     end,