This commit is contained in:
ksyasuda 2025-02-13 00:38:12 -08:00
parent 324074bb1c
commit db6c0f9b4e
No known key found for this signature in database
5 changed files with 180 additions and 181 deletions

View File

@ -22,6 +22,7 @@ source ~/.config/nvim/plugin-confs/lualine.lua
source ~/.config/nvim/plugin-confs/nvimtree.lua
source ~/.config/nvim/plugin-confs/presence.lua
source ~/.config/nvim/plugin-confs/treesitter.lua
source ~/.config/nvim/plugin-confs/treesitter-context.lua
source ~/.config/nvim/plugin-confs/whichkey.lua
source ~/.config/nvim/plugin-confs/telescope.lua
source ~/.config/nvim/plugin-confs/telescope-file-browser.lua

View File

@ -10,6 +10,7 @@ require('packer').startup(function(use)
require('nvim-treesitter.install').update({ with_sync = true })
end
}
use { 'nvim-treesitter/nvim-treesitter-context' }
-- TELESCOPE {{{
@ -95,8 +96,7 @@ require('packer').startup(function(use)
"jackMort/ChatGPT.nvim",
commit = "24bcca7",
config = function()
require("chatgpt").setup(
{
require("chatgpt").setup({
api_key_cmd = "cat /home/sudacode/.openaikey",
yank_register = "+",
edit_with_instructions = {
@ -108,8 +108,8 @@ require('packer').startup(function(use)
toggle_settings = "<C-o>",
toggle_help = "<C-h>",
cycle_windows = "<Tab>",
use_output_as_input = "<C-i>",
},
use_output_as_input = "<C-i>"
}
},
chat = {
welcome_message = WELCOME_MESSAGE,
@ -125,13 +125,11 @@ require('packer').startup(function(use)
current_line_sign = "",
border = {
style = "rounded",
text = {
top = " Sessions ",
},
text = { top = " Sessions " }
},
win_options = {
winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
},
winhighlight = "Normal:Normal,FloatBorder:FloatBorder"
}
},
keymaps = {
close = "<C-c>",
@ -155,93 +153,68 @@ require('packer').startup(function(use)
toggle_help = "<C-h>",
toggle_message_role = "<C-r>",
toggle_system_role_open = "<C-s>",
stop_generating = "<C-x>",
},
stop_generating = "<C-x>"
}
},
popup_layout = {
default = "center",
center = {
width = "80%",
height = "80%",
},
right = {
width = "30%",
width_settings_open = "50%",
},
center = { width = "80%", height = "80%" },
right = { width = "30%", width_settings_open = "50%" }
},
popup_window = {
border = {
highlight = "FloatBorder",
style = "rounded",
text = {
top = " ChatGPT ",
},
text = { top = " ChatGPT " }
},
win_options = {
wrap = true,
linebreak = true,
foldcolumn = "1",
winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
},
buf_options = {
filetype = "markdown",
winhighlight = "Normal:Normal,FloatBorder:FloatBorder"
},
buf_options = { filetype = "markdown" }
},
system_window = {
border = {
highlight = "FloatBorder",
style = "rounded",
text = {
top = " SYSTEM ",
},
text = { top = " SYSTEM " }
},
win_options = {
wrap = true,
linebreak = true,
foldcolumn = "2",
winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
},
winhighlight = "Normal:Normal,FloatBorder:FloatBorder"
}
},
popup_input = {
prompt = "",
border = {
highlight = "FloatBorder",
style = "rounded",
text = {
top_align = "center",
top = " Prompt ",
},
text = { top_align = "center", top = " Prompt " }
},
win_options = {
winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
winhighlight = "Normal:Normal,FloatBorder:FloatBorder"
},
submit = "<C-Enter>",
submit_n = "<Enter>",
max_visible_lines = 20,
max_visible_lines = 20
},
settings_window = {
setting_sign = "",
border = {
style = "rounded",
text = {
top = " Settings ",
},
},
border = { style = "rounded", text = { top = " Settings " } },
win_options = {
winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
},
winhighlight = "Normal:Normal,FloatBorder:FloatBorder"
}
},
help_window = {
setting_sign = "",
border = {
style = "rounded",
text = {
top = " Help ",
},
},
border = { style = "rounded", text = { top = " Help " } },
win_options = {
winhighlight = "Normal:Normal,FloatBorder:FloatBorder",
},
winhighlight = "Normal:Normal,FloatBorder:FloatBorder"
}
},
openai_params = {
model = "gpt-3.5-turbo",
@ -250,7 +223,7 @@ require('packer').startup(function(use)
max_tokens = 300,
temperature = 0,
top_p = 1,
n = 1,
n = 1
},
openai_edit_params = {
model = "gpt-3.5-turbo",
@ -258,18 +231,18 @@ require('packer').startup(function(use)
presence_penalty = 0,
temperature = 0,
top_p = 1,
n = 1,
n = 1
},
use_openai_functions_for_edits = false,
actions_paths = {},
show_quickfixes_cmd = "Trouble quickfix",
predefined_chat_gpt_prompts = "https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv",
predefined_chat_gpt_prompts =
"https://raw.githubusercontent.com/f/awesome-chatgpt-prompts/main/prompts.csv",
highlights = {
help_key = "@symbol",
help_description = "@comment",
},
help_description = "@comment"
}
)
})
end,
requires = {
"MunifTanjim/nui.nvim", "nvim-lua/plenary.nvim",
@ -299,7 +272,8 @@ require('packer').startup(function(use)
use { 'hrsh7th/cmp-path' }
use { 'hrsh7th/nvim-cmp' }
use { 'https://git.sr.ht/~whynothugo/lsp_lines.nvim' }
use { 'jose-elias-alvarez/null-ls.nvim' }
-- use { 'jose-elias-alvarez/null-ls.nvim' }
use { 'nvimtools/none-ls.nvim' }
use { 'neovim/nvim-lspconfig' }
use { 'onsails/lspkind-nvim' }
@ -324,6 +298,15 @@ require('packer').startup(function(use)
-- }}}
-- UI {{{
use {
"lukas-reineke/indent-blankline.nvim",
config = function()
opts = {}
-- Other blankline configuration here
require("ibl").setup(require("indent-rainbowline").make_opts(opts))
end,
requires = { "TheGLander/indent-rainbowline.nvim" }
}
use {
'glepnir/dashboard-nvim',

View File

@ -19,6 +19,7 @@ o.relativenumber = true
o.colorcolumn = '80'
o.textwidth = 80
o.shiftwidth = 4
o.expandtab = true
o.tabstop = 4
o.autoindent = true
o.ignorecase = true

View File

@ -215,7 +215,7 @@ cmp.setup.cmdline(':', {
local servers = {
'bashls', 'pyright', 'jsonls', 'yamlls', 'vimls', 'dotls', 'dockerls',
'html', 'cssls', 'lua_ls', 'eslint', 'tsserver', 'angularls', 'ansiblels'
'html', 'cssls', 'lua_ls', 'eslint', 'ts_ls', 'angularls', 'ansiblels'
}
for _, lsp in ipairs(servers) do

View File

@ -0,0 +1,14 @@
require 'treesitter-context'.setup {
enable = true, -- Enable this plugin (Can be enabled/disabled later via commands)
max_lines = 0, -- How many lines the window should span. Values <= 0 mean no limit.
min_window_height = 0, -- Minimum editor window height to enable context. Values <= 0 mean no limit.
line_numbers = true,
multiline_threshold = 20, -- Maximum number of lines to show for a single context
trim_scope = 'outer', -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
-- Separator between context and content. Should be a single character string, like '-'.
-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
separator = nil,
zindex = 20, -- The Z-index of the context window
on_attach = nil -- (fun(buf: integer): boolean) return false to disable attaching
}