From 0df26f6082b7204d2177a82f69113ce93022f2af Mon Sep 17 00:00:00 2001 From: ksyasuda Date: Sun, 13 Aug 2023 01:29:34 -0700 Subject: [PATCH] fix chat gpt and change to doom-one --- init.vim | 2 +- lua/plugins.lua | 29 +++++--- plugin-confs/chatgpt.lua | 151 ++++++++++++++++++++++++--------------- 3 files changed, 112 insertions(+), 70 deletions(-) diff --git a/init.vim b/init.vim index 8c07fa2..ab8d7b5 100644 --- a/init.vim +++ b/init.vim @@ -80,6 +80,6 @@ command! PS execute ":PackerSync" " set termguicolors " colorscheme doom-one " colorscheme onedark -colorscheme catppuccin +" colorscheme catppuccin highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34 highlight PmenuSel guifg=purple guibg=red diff --git a/lua/plugins.lua b/lua/plugins.lua index f620b90..9330f1b 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -37,7 +37,7 @@ require('packer').startup(function(use) }, suggestion = { enabled = false, - auto_trigger = true, + auto_trigger = false, debounce = 75, keymap = { accept = "", @@ -180,19 +180,19 @@ require('packer').startup(function(use) use 'williamboman/nvim-lsp-installer' use { 'Mofiqul/dracula.nvim' } - use { + use({ 'NTBBloodbath/doom-one.nvim', setup = function() -- Add color to cursor vim.g.doom_one_cursor_coloring = false -- Set :terminal colors - vim.g.doom_one_terminal_colors = false + vim.g.doom_one_terminal_colors = true -- Enable italic comments - vim.g.doom_one_italic_comments = true + vim.g.doom_one_italic_comments = false -- Enable TS support vim.g.doom_one_enable_treesitter = true -- Color whole diagnostic text or only underline - vim.g.doom_one_diagnostics_text_color = true + vim.g.doom_one_diagnostics_text_color = false -- Enable transparent background vim.g.doom_one_transparent_background = false @@ -201,24 +201,31 @@ require('packer').startup(function(use) vim.g.doom_one_pumblend_transparency = 20 -- Plugins integration - vim.g.doom_one_plugin_neorg = false + vim.g.doom_one_plugin_neorg = true vim.g.doom_one_plugin_barbar = false - vim.g.doom_one_plugin_telescope = true + vim.g.doom_one_plugin_telescope = false vim.g.doom_one_plugin_neogit = true vim.g.doom_one_plugin_nvim_tree = true vim.g.doom_one_plugin_dashboard = true - vim.g.doom_one_plugin_startify = false + vim.g.doom_one_plugin_startify = true vim.g.doom_one_plugin_whichkey = true vim.g.doom_one_plugin_indent_blankline = true - vim.g.doom_one_plugin_vim_illuminate = false - vim.g.doom_one_plugin_lspsaga = true + vim.g.doom_one_plugin_vim_illuminate = true + vim.g.doom_one_plugin_lspsaga = false + end, + config = function() + vim.cmd("colorscheme doom-one") + vim.cmd( + "highlight Pmenu ctermfg=white ctermbg=black gui=NONE guifg=white guibg=#282C34") + vim.cmd("highlight PmenuSel guifg=purple guibg=red") end - } + }) use { 'olimorris/onedarkpro.nvim' } use { 'projekt0n/github-nvim-theme' } use({ "jackMort/ChatGPT.nvim", + commit = "24bcca7", requires = { "MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim", "nvim-telescope/telescope.nvim" diff --git a/plugin-confs/chatgpt.lua b/plugin-confs/chatgpt.lua index 6c0fffc..38c9c5b 100644 --- a/plugin-confs/chatgpt.lua +++ b/plugin-confs/chatgpt.lua @@ -1,77 +1,112 @@ require("chatgpt").setup({ - { - welcome_message = "ChatGPT is ready!", - loading_text = "loading", - question_sign = "", -- you can use emoji if you want e.g. 🙂 - answer_sign = "ﮧ", -- 🤖 - max_line_length = 120, - yank_register = "+", - chat_layout = { - relative = "editor", - position = "50%", - size = { - height = "80%", - width = "80%", + api_key_cmd = "cat /home/sudacode/.config/openai/apikey", + yank_register = "+", + edit_with_instructions = { + diff = false, + keymaps = { + close = "", + accept = "", + toggle_diff = "", + toggle_settings = "", + cycle_windows = "", + use_output_as_input = "" + } + }, + chat = { + welcome_message = WELCOME_MESSAGE, + loading_text = "Loading, please wait ...", + question_sign = "", + answer_sign = "ﮧ", + max_line_length = 120, + sessions_window = { + border = { style = "rounded", text = { top = " Sessions " } }, + win_options = { + winhighlight = "Normal:Normal,FloatBorder:FloatBorder" + } }, - }, - settings_window = { + keymaps = { + close = { "" }, + yank_last = "", + yank_last_code = "", + scroll_up = "", + scroll_down = "", + new_session = "", + cycle_windows = "", + cycle_modes = "", + select_session = "", + rename_session = "r", + delete_session = "d", + draft_message = "", + toggle_settings = "", + toggle_message_role = "", + toggle_system_role_open = "", + stop_generating = "" + } + }, + popup_layout = { + default = "center", + center = { width = "80%", height = "80%" }, + right = { width = "30%", width_settings_open = "50%" } + }, + popup_window = { border = { - style = "rounded", - text = { - top = " Settings ", - }, + highlight = "FloatBorder", + style = "rounded", + text = { top = " ChatGPT " } }, - }, - chat_window = { - filetype = "chatgpt", + win_options = { + wrap = true, + linebreak = true, + foldcolumn = "1", + winhighlight = "Normal:Normal,FloatBorder:FloatBorder" + }, + buf_options = { filetype = "markdown" } + }, + system_window = { border = { - highlight = "FloatBorder", - style = "rounded", - text = { - top = " ChatGPT ", - }, + highlight = "FloatBorder", + style = "rounded", + text = { top = " SYSTEM " } }, - }, - chat_input = { + win_options = { + wrap = true, + linebreak = true, + foldcolumn = "2", + winhighlight = "Normal:Normal,FloatBorder:FloatBorder" + } + }, + popup_input = { prompt = "  ", border = { - highlight = "FloatBorder", - style = "rounded", - text = { - top_align = "center", - top = " Prompt ", - }, + highlight = "FloatBorder", + style = "rounded", + text = { top_align = "center", top = " Prompt " } }, - }, - openai_params = { + win_options = { winhighlight = "Normal:Normal,FloatBorder:FloatBorder" }, + submit = "", + submit_n = "", + max_visible_lines = 20 + }, + settings_window = { + border = { style = "rounded", text = { top = " Settings " } }, + win_options = { winhighlight = "Normal:Normal,FloatBorder:FloatBorder" } + }, + openai_params = { model = "gpt-3.5-turbo", frequency_penalty = 0, presence_penalty = 0, max_tokens = 300, temperature = 0, top_p = 1, - n = 1, - }, - openai_edit_params = { + n = 1 + }, + openai_edit_params = { model = "code-davinci-edit-001", temperature = 0, top_p = 1, - n = 1, - }, - keymaps = { - close = { "" }, - submit = "", - yank_last = "", - yank_last_code = "", - scroll_up = "", - scroll_down = "", - toggle_settings = "", - new_session = "", - cycle_windows = "", - -- in the Sessions pane - select_session = "", - rename_session = "r", - delete_session = "d", - }, - } + n = 1 + }, + actions_paths = {}, + show_quickfixes_cmd = "Trouble quickfix", + predefined_chat_gpt_prompts = "https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv" })