Compare commits
16 Commits
master
...
New-Master
| Author | SHA1 | Date | |
|---|---|---|---|
| 143ca6b166 | |||
| f7f6dc35e1 | |||
| c12621a215 | |||
| 0b240bf871 | |||
| e3a19d78b5 | |||
| 239149d1d3 | |||
| 4af56857b4 | |||
| d81ff48af0 | |||
| f0cd5945e1 | |||
| 20165cfee1 | |||
| 6d2ae4db0e | |||
| cc174a1ec8 | |||
| a9e3cd2d68 | |||
| eba485e086 | |||
| 6d181f0f4b | |||
| fcc084630a |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1 +0,0 @@
|
|||||||
nvim-pack-lock.json
|
|
||||||
51
init.lua
51
init.lua
@@ -1,22 +1,18 @@
|
|||||||
local vim = vim
|
local vim = vim
|
||||||
local host = vim.loop.os_gethostname()
|
local host = vim.loop.os_gethostname()
|
||||||
obsidian_dir = "~/Documents/Notebooks"
|
|
||||||
require("options") -- ./lua/options.lua
|
require("options") -- ./lua/options.lua
|
||||||
require("plugins") -- ./lua/plugins.lua
|
require("plugins") -- ./lua/plugins.lua
|
||||||
require("utils.t3_functions") -- ./lua/utils/t3_functions.lua
|
require("utils.t3_functions") -- ./lua/utils/t3_functions.lua
|
||||||
require("obsidian_config") -- ./lua/obsidian_config.lua
|
|
||||||
require("utils.t3_overrides") -- ./lua/utils/t3_overrides.lua
|
require("utils.t3_overrides") -- ./lua/utils/t3_overrides.lua
|
||||||
require("utils.reload") -- ./lua/utils/reload.lua
|
require("utils.reload") -- ./lua/utils/reload.lua
|
||||||
require("vimwiki") -- ./lua/vimwiki.lua
|
require("vimwiki") -- ./lua/vimwiki.lua
|
||||||
require("keymaps") -- ./lua/keymaps.lua
|
require("keymaps") -- ./lua/keymaps.lua
|
||||||
require("lsp") -- ./lua/lsp.lua
|
require("lsp") -- ./lua/lsp.lua
|
||||||
-- require("godot") -- ./lua/godot.lua
|
|
||||||
-- require("completion") -- ./lua/completion.lua
|
-- require("completion") -- ./lua/completion.lua
|
||||||
require("coc") -- ./lua/coc.lua
|
require("coc") -- ./lua/coc.lua
|
||||||
require("treesitter") -- ./lua/treesitter.lua
|
require("treesitter") -- ./lua/treesitter.lua
|
||||||
require("autocmds") -- ./lua/autocmds.lua
|
require("autocmds") -- ./lua/autocmds.lua
|
||||||
require("diagnostics") -- ./lua/diagnostics.lua
|
require("diagnostics") -- ./lua/diagnostics.lua
|
||||||
require("avante_settings") -- ./lua/avante_settings.lua
|
|
||||||
require('telescope_configuration') -- ./lua/telescope_configuration.lua
|
require('telescope_configuration') -- ./lua/telescope_configuration.lua
|
||||||
|
|
||||||
local function cyberdream()
|
local function cyberdream()
|
||||||
@@ -36,7 +32,7 @@ local function cyberdream()
|
|||||||
-- Set terminal colors used in `:terminal`
|
-- Set terminal colors used in `:terminal`
|
||||||
terminal_colors = true,
|
terminal_colors = true,
|
||||||
-- Improve start up time by caching highlights. Generate cache with :CyberdreamBuildCache and clear with :CyberdreamClearCache
|
-- Improve start up time by caching highlights. Generate cache with :CyberdreamBuildCache and clear with :CyberdreamClearCache
|
||||||
cache = true,
|
cache = false,
|
||||||
-- Override highlight groups with your own colour values
|
-- Override highlight groups with your own colour values
|
||||||
-- highlights = {
|
-- highlights = {
|
||||||
-- -- Highlight groups to override, adding new groups is also possible
|
-- -- Highlight groups to override, adding new groups is also possible
|
||||||
@@ -71,16 +67,11 @@ local function cyberdream()
|
|||||||
-- },
|
-- },
|
||||||
-- Disable or enable colorscheme extensions
|
-- Disable or enable colorscheme extensions
|
||||||
extensions = {
|
extensions = {
|
||||||
telescope = true,
|
telescope = true,
|
||||||
notify = true,
|
notify = true,
|
||||||
mini = true,
|
mini = true,
|
||||||
treesitter = true,
|
treesitter = true,
|
||||||
whichkey = true,
|
-- More extensions can be found in `lua/cyberdream/extensions/*.lua`
|
||||||
treesittercontext = true,
|
|
||||||
markdown = true,
|
|
||||||
snacks = true,
|
|
||||||
trouble = true,
|
|
||||||
-- More extensions can be found in `lua/cyberdream/extensions/*.lua`
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
@@ -101,36 +92,6 @@ if host == "xps13" then
|
|||||||
-- },
|
-- },
|
||||||
-- })
|
-- })
|
||||||
-- })
|
-- })
|
||||||
elseif host == "cachyos" then
|
|
||||||
cyberdream()
|
|
||||||
-- require('tokyonight').setup({
|
|
||||||
-- style = "storm", -- "storm", "moon", "day", "night"
|
|
||||||
-- transparent = false, -- Enable transparent background
|
|
||||||
-- terminal_colors = true, -- Enable terminal colors
|
|
||||||
-- styles = {
|
|
||||||
-- comments = { italic = true }, -- Italic comments
|
|
||||||
-- keywords = { italic = true }, -- Italic keywords
|
|
||||||
-- functions = { bold = true }, -- Bold functions
|
|
||||||
-- variables = {}, -- No special style for variables
|
|
||||||
-- sidebars = "dark", -- Dark sidebars
|
|
||||||
-- floats = "dark", -- Dark floating windows
|
|
||||||
-- },
|
|
||||||
-- })
|
|
||||||
elseif host == "Vector" then
|
|
||||||
cyberdream()
|
|
||||||
-- require('tokyonight').setup({
|
|
||||||
-- style = "storm", -- "storm", "moon", "day", "night"
|
|
||||||
-- transparent = false, -- Enable transparent background
|
|
||||||
-- terminal_colors = true, -- Enable terminal colors
|
|
||||||
-- styles = {
|
|
||||||
-- comments = { italic = true }, -- Italic comments
|
|
||||||
-- keywords = { italic = true }, -- Italic keywords
|
|
||||||
-- functions = { bold = true }, -- Bold functions
|
|
||||||
-- variables = {}, -- No special style for variables
|
|
||||||
-- sidebars = "dark", -- Dark sidebars
|
|
||||||
-- floats = "dark", -- Dark floating windows
|
|
||||||
-- },
|
|
||||||
-- })
|
|
||||||
elseif host == "Titan" then
|
elseif host == "Titan" then
|
||||||
cyberdream()
|
cyberdream()
|
||||||
-- require('tokyonight').setup({
|
-- require('tokyonight').setup({
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
local vim = vim
|
|
||||||
local port = os.getenv 'GDScript_Port' or '6005'
|
|
||||||
local cmd = vim.lsp.rpc.connect('127.0.0.1', tonumber(port))
|
|
||||||
|
|
||||||
return {
|
|
||||||
cmd = cmd,
|
|
||||||
filetypes = { 'gd', 'gdscript', 'gdscript3' },
|
|
||||||
root_markers = { 'project.godot', '.git' }
|
|
||||||
}
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
require('avante').setup({
|
|
||||||
instructions_file = "avante.md",
|
|
||||||
provider = "ollama",
|
|
||||||
providers = {
|
|
||||||
ollama = {
|
|
||||||
endpoint = "http://localhost:11434",
|
|
||||||
model = "codellama:latest",
|
|
||||||
},
|
|
||||||
},
|
|
||||||
behavior = {
|
|
||||||
auto_focus_sidebar = true,
|
|
||||||
auto_suggestions = true, -- Experimental.
|
|
||||||
jump_result_buffer_on_finish = false,
|
|
||||||
},
|
|
||||||
windows = {
|
|
||||||
position = "right",
|
|
||||||
fillchars = "eob: ",
|
|
||||||
wrap = true,
|
|
||||||
width = 30,
|
|
||||||
height = 30,
|
|
||||||
sidebar_header = {
|
|
||||||
enabled = true,
|
|
||||||
align = "center",
|
|
||||||
rounded = true,
|
|
||||||
},
|
|
||||||
spinner = {
|
|
||||||
editing = {
|
|
||||||
"⡀",
|
|
||||||
"⠄",
|
|
||||||
"⠂",
|
|
||||||
"⠁",
|
|
||||||
"⠈",
|
|
||||||
"⠐",
|
|
||||||
"⠠",
|
|
||||||
"⢀",
|
|
||||||
"⣀",
|
|
||||||
"⢄",
|
|
||||||
"⢂",
|
|
||||||
"⢁",
|
|
||||||
"⢈",
|
|
||||||
"⢐",
|
|
||||||
"⢠",
|
|
||||||
"⣠",
|
|
||||||
"⢤",
|
|
||||||
"⢢",
|
|
||||||
"⢡",
|
|
||||||
"⢨",
|
|
||||||
"⢰",
|
|
||||||
"⣰",
|
|
||||||
"⢴",
|
|
||||||
"⢲",
|
|
||||||
"⢱",
|
|
||||||
"⢸",
|
|
||||||
"⣸",
|
|
||||||
"⢼",
|
|
||||||
"⢺",
|
|
||||||
"⢹",
|
|
||||||
"⣹",
|
|
||||||
"⢽",
|
|
||||||
"⢻",
|
|
||||||
"⣻",
|
|
||||||
"⢿",
|
|
||||||
"⣿",
|
|
||||||
},
|
|
||||||
generating = { "·", "✢", "✳", "∗", "✻", "✽" },
|
|
||||||
thinking = { "🤯", "🙄" },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
@@ -14,11 +14,9 @@ vim.g.coc_global_extensions = {
|
|||||||
'coc-prettier',
|
'coc-prettier',
|
||||||
'coc-eslint',
|
'coc-eslint',
|
||||||
'coc-markdownlint',
|
'coc-markdownlint',
|
||||||
'coc-vimlsp',
|
'coc-vimlsp'
|
||||||
'coc-zig'
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
-- Use <Tab> and <S-Tab> to navigate completion list
|
-- Use <Tab> and <S-Tab> to navigate completion list
|
||||||
vim.keymap.set('i', '<Tab>', function()
|
vim.keymap.set('i', '<Tab>', function()
|
||||||
if vim.fn['coc#pum#visible']() == 1 then
|
if vim.fn['coc#pum#visible']() == 1 then
|
||||||
@@ -43,4 +41,4 @@ vim.keymap.set('i', '<CR>', function()
|
|||||||
else
|
else
|
||||||
return '<CR>'
|
return '<CR>'
|
||||||
end
|
end
|
||||||
end, { expr = true, silent = true })
|
end, { expr = true, silent = true })
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
local vim = vim
|
|
||||||
local paths_to_check = {'/', '/../'}
|
|
||||||
local is_godot_project = false
|
|
||||||
local godot_project_path = ''
|
|
||||||
local cwd = vim.fn.getcwd()
|
|
||||||
|
|
||||||
for key, value in pairs(paths_to_check) do
|
|
||||||
if vim.uv.fs_stat(cwd .. value .. 'project.godot') then
|
|
||||||
is_godot_project = true
|
|
||||||
godot_project_path = cwd .. value
|
|
||||||
break
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
local is_server_running = vim.uv.fs_stat(godot_project_path .. '/server.pipe')
|
|
||||||
if is_godot_project and not is_server_running then
|
|
||||||
vim.fn.serverstart(godot_project_path .. '/server.pipe')
|
|
||||||
end
|
|
||||||
@@ -12,8 +12,8 @@ end, { noremap = true })
|
|||||||
|
|
||||||
-- Leader Maps
|
-- Leader Maps
|
||||||
vim.keymap.set("n", "<leader>f", "", { desc = "Files"})
|
vim.keymap.set("n", "<leader>f", "", { desc = "Files"})
|
||||||
-- vim.keymap.set("n", "<leader>ff", ":FzfLua files<CR>", { desc = "File Finder"})
|
vim.keymap.set("n", "<leader>ff", ":FzfLua files<CR>", { desc = "File Finder"})
|
||||||
vim.keymap.set("n", "<leader>ff", ":Pick files<CR>", { desc = "File Picker"})
|
-- vim.keymap.set("n", "<leader>fe", ":Pick files<CR>", { desc = "File Picker"})
|
||||||
vim.keymap.set("n", "<leader>ft", t3_toggle_netrw, { desc = "File Tree"})
|
vim.keymap.set("n", "<leader>ft", t3_toggle_netrw, { desc = "File Tree"})
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>b", "", { desc = "Buffers"})
|
vim.keymap.set("n", "<leader>b", "", { desc = "Buffers"})
|
||||||
@@ -158,38 +158,3 @@ vim.keymap.set( "n", "<leader>ltd", ":Telescope lsp_dynamic_workspace_symbols<CR
|
|||||||
vim.keymap.set( "n", "<C-]>", "<cmd>lua vim.lsp.buf.definition()<cr>", {desc = "Go to Definition" })
|
vim.keymap.set( "n", "<C-]>", "<cmd>lua vim.lsp.buf.definition()<cr>", {desc = "Go to Definition" })
|
||||||
vim.keymap.set( "n", "<C-t>", "<C-o>", {desc = "Jump Back" })
|
vim.keymap.set( "n", "<C-t>", "<C-o>", {desc = "Jump Back" })
|
||||||
vim.keymap.set( "n", "g]", "<cmd>lua vim.lsp.buf.references()<cr>", {desc = "Find References" })
|
vim.keymap.set( "n", "g]", "<cmd>lua vim.lsp.buf.references()<cr>", {desc = "Find References" })
|
||||||
|
|
||||||
-- Top Pickers & Explorer
|
|
||||||
vim.keymap.set("n", "<leader><space>", ":lua Snacks.picker.smart()<cr>", { desc = "Smart Find Files" })
|
|
||||||
vim.keymap.set("n", "<leader>/", ":lua Snacks.picker.grep()<cr>", { desc = "Grep" })
|
|
||||||
vim.keymap.set("n", "<leader>:", ":lua Snacks.picker.command_history()<cr>", { desc = "Command History" })
|
|
||||||
vim.keymap.set("n", "<leader>n", ":lua Snacks.picker.notifications()<cr>", { desc = "Notification History" })
|
|
||||||
-- vim.keymap.set("n", "<leader>e", ":lua Snacks.explorer()<cr>", { desc = "File Explorer" })
|
|
||||||
vim.keymap.set("n", "<leader>e", ":Lexplore<cr>", { desc = "File Explorer" })
|
|
||||||
vim.keymap.set("n", "<leader>fb", ":lua Snacks.picker.buffers()<cr>", { desc = "Buffers" })
|
|
||||||
vim.keymap.set("n", "<leader>ff", ":lua Snacks.picker.files()<cr>", { desc = "Find Files" })
|
|
||||||
vim.keymap.set("n", "<leader>fg", ":lua Snacks.picker.git_files()<cr>", { desc = "Find Git Files" })
|
|
||||||
vim.keymap.set("n", "<leader>fp", ":lua Snacks.picker.projects()<cr>", { desc = "Projects" })
|
|
||||||
vim.keymap.set("n", "<leader>fr", ":lua Snacks.picker.recent()<cr>", { desc = "Recent" })
|
|
||||||
vim.keymap.set("n", "<leader>Gb", ":lua Snacks.picker.git_branches()<cr>", { desc = "Git Branches" })
|
|
||||||
vim.keymap.set("n", "<leader>Gl", ":lua Snacks.picker.git_log()<cr>", { desc = "Git Log" })
|
|
||||||
vim.keymap.set("n", "<leader>GL", ":lua Snacks.picker.git_log_line()<cr>", { desc = "Git Log Line" })
|
|
||||||
vim.keymap.set("n", "<leader>Gs", ":lua Snacks.picker.git_status()<cr>", { desc = "Git Status" })
|
|
||||||
vim.keymap.set("n", "<leader>GS", ":lua Snacks.picker.git_stash()<cr>", { desc = "Git Stash" })
|
|
||||||
vim.keymap.set("n", "<leader>Gd", ":lua Snacks.picker.git_diff()<cr>", { desc = "Git Diff (Hunks)" })
|
|
||||||
vim.keymap.set("n", "<leader>Gf", ":lua Snacks.picker.git_log_file()<cr>", { desc = "Git Log File" })
|
|
||||||
vim.keymap.set("n", "<leader>sb", ":lua Snacks.picker.buffers()<cr>", { desc = "Buffers" })
|
|
||||||
vim.keymap.set("n", "<leader>ss", ":lua Snacks.picker.smart()<cr>", { desc = "Smart Find Files" })
|
|
||||||
vim.keymap.set("n", "<leader>sp", ":lua Snacks.picker.projects()<cr>", { desc = "Projects" })
|
|
||||||
vim.keymap.set("n", "<leader>sr", ":lua Snacks.picker.recent()<cr>", { desc = "Recent" })
|
|
||||||
vim.keymap.set("n", "<leader>sw", ":lua Snacks.picker.words()<cr>", { desc = "Next Reference" })
|
|
||||||
vim.keymap.set("n", "<leader>sw", ":lua Snacks.words.jump(vim.v.count1)<cr>", { desc = "Next Reference" })
|
|
||||||
vim.keymap.set("n", "<leader>sw", ":lua Snacks.words.jump(-vim.v.count1)<cr>", { desc = "Prev Reference" })
|
|
||||||
|
|
||||||
-- Terminal
|
|
||||||
-- vim.keymap.set("n", "<c-/>", ":lua Snacks.terminal()<cr>", { desc = "Toggle Terminal" })
|
|
||||||
-- vim.keymap.set("n", "<c-_>", ":lua Snacks.terminal()<cr>", { desc = "which_key_ignore" })
|
|
||||||
|
|
||||||
-- Words Jump
|
|
||||||
vim.keymap.set("n", "]]", ":lua Snacks.words.jump(vim.v.count1)<cr>", { desc = "Next Reference", })
|
|
||||||
vim.keymap.set("n", "[[", ":lua Snacks.words.jump(-vim.v.count1)<cr>", { desc = "Prev Reference", })
|
|
||||||
|
|||||||
@@ -40,9 +40,6 @@ vim.lsp.enable('basedpyright', {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
-- vim.lsp.config('gdscript', {})
|
|
||||||
-- vim.lsp.enable('gdscript')
|
|
||||||
|
|
||||||
|
|
||||||
require("lsp_signature").setup({
|
require("lsp_signature").setup({
|
||||||
debug = false,
|
debug = false,
|
||||||
@@ -54,7 +51,7 @@ require("lsp_signature").setup({
|
|||||||
floating_window = true,
|
floating_window = true,
|
||||||
floating_window_above_cur_line = false,
|
floating_window_above_cur_line = false,
|
||||||
floating_window_off_x = 1,
|
floating_window_off_x = 1,
|
||||||
floating_window_off_y = 2,
|
floating_window_off_y = 1,
|
||||||
-- hint_enable = true,
|
-- hint_enable = true,
|
||||||
hint_enable = false,
|
hint_enable = false,
|
||||||
hint_inline = function() return false end,
|
hint_inline = function() return false end,
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
require("obsidian").setup({
|
|
||||||
workspaces = {
|
|
||||||
{
|
|
||||||
name = "Notebooks",
|
|
||||||
path = obsidian_dir,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
@@ -15,8 +15,7 @@ vim.o.termguicolors = true
|
|||||||
vim.o.winborder = "rounded"
|
vim.o.winborder = "rounded"
|
||||||
vim.o.clipboard = "unnamedplus"
|
vim.o.clipboard = "unnamedplus"
|
||||||
vim.o.completeopt = "menuone"
|
vim.o.completeopt = "menuone"
|
||||||
vim.o.shell = "/usr/bin/env fish"
|
vim.o.shell = "/usr/bin/env zsh"
|
||||||
-- vim.o.shell = "/usr/bin/env zsh"
|
|
||||||
-- vim.o.completeopt = "menuone,noinsert,noselect"
|
-- vim.o.completeopt = "menuone,noinsert,noselect"
|
||||||
|
|
||||||
vim.o.cursorline = true
|
vim.o.cursorline = true
|
||||||
|
|||||||
240
lua/plugins.lua
240
lua/plugins.lua
@@ -28,8 +28,7 @@ vim.pack.add({
|
|||||||
-- { src = "https://github.com/hrsh7th/cmp-cmdline" },
|
-- { src = "https://github.com/hrsh7th/cmp-cmdline" },
|
||||||
-- { src = "https://github.com/hrsh7th/cmp-nvim-lua" },
|
-- { src = "https://github.com/hrsh7th/cmp-nvim-lua" },
|
||||||
-- { src = "https://github.com/saadparwaiz1/cmp_luasnip" },
|
-- { src = "https://github.com/saadparwaiz1/cmp_luasnip" },
|
||||||
-- { src = "https://github.com/github/copilot.vim" },
|
{ src = "https://github.com/github/copilot.vim" },
|
||||||
-- { src = "https://github.com/jacob411/Ollama-Copilot" },
|
|
||||||
{ src = "https://github.com/pysan3/pathlib.nvim" },
|
{ src = "https://github.com/pysan3/pathlib.nvim" },
|
||||||
{ src = "https://github.com/nvim-orgmode/org-bullets.nvim" },
|
{ src = "https://github.com/nvim-orgmode/org-bullets.nvim" },
|
||||||
{ src = "https://github.com/lukas-reineke/headlines.nvim" },
|
{ src = "https://github.com/lukas-reineke/headlines.nvim" },
|
||||||
@@ -65,12 +64,11 @@ vim.pack.add({
|
|||||||
{ src = "https://github.com/alaviss/nim.nvim" },
|
{ src = "https://github.com/alaviss/nim.nvim" },
|
||||||
{ src = "https://github.com/glebzlat/arduino-nvim" },
|
{ src = "https://github.com/glebzlat/arduino-nvim" },
|
||||||
{ src = "https://github.com/norcalli/nvim-colorizer.lua" },
|
{ src = "https://github.com/norcalli/nvim-colorizer.lua" },
|
||||||
-- { src = "https://github.com/HiPhish/rainbow-delimiters.nvim" },
|
|
||||||
{ src = "https://github.com/lewis6991/gitsigns.nvim" },
|
|
||||||
{ src = "https://github.com/amitds1997/remote-nvim.nvim" },
|
|
||||||
{ src = "https://github.com/epwalsh/obsidian.nvim" },
|
|
||||||
})
|
})
|
||||||
|
|
||||||
|
if host == "xps13" then
|
||||||
|
end
|
||||||
|
|
||||||
require('mini.icons').setup({})
|
require('mini.icons').setup({})
|
||||||
require('mini.pick').setup({})
|
require('mini.pick').setup({})
|
||||||
require('mini.pairs').setup({})
|
require('mini.pairs').setup({})
|
||||||
@@ -81,17 +79,6 @@ require('mini.tabline').setup({})
|
|||||||
require('mini.fuzzy').setup({})
|
require('mini.fuzzy').setup({})
|
||||||
-- require('lualine').setup({ options = { theme = 'tokyonight' } })
|
-- require('lualine').setup({ options = { theme = 'tokyonight' } })
|
||||||
require('which-key').setup({})
|
require('which-key').setup({})
|
||||||
require("snacks").setup({
|
|
||||||
explorer = { enabled = true },
|
|
||||||
image = { enabled = true },
|
|
||||||
input = { enabled = true },
|
|
||||||
picker = { enabled = true },
|
|
||||||
scope = { enabled = true },
|
|
||||||
notifier = { enabled = true },
|
|
||||||
quickfile = { enabled = true },
|
|
||||||
scroll = { enabled = true },
|
|
||||||
statuscolumn = { enabled = true },
|
|
||||||
})
|
|
||||||
require('fzf-lua').setup({
|
require('fzf-lua').setup({
|
||||||
winopts = {
|
winopts = {
|
||||||
height = 0.85,
|
height = 0.85,
|
||||||
@@ -215,6 +202,35 @@ require('nvim-devdocs').setup({})
|
|||||||
-- },
|
-- },
|
||||||
-- })
|
-- })
|
||||||
require("claudecode").setup({})
|
require("claudecode").setup({})
|
||||||
|
require('avante').setup({
|
||||||
|
opts = {
|
||||||
|
-- add any opts here
|
||||||
|
-- this file can contain specific instructions for your project
|
||||||
|
instructions_file = "avante.md",
|
||||||
|
-- for example
|
||||||
|
provider = "copilot",
|
||||||
|
providers = {
|
||||||
|
-- claude = {
|
||||||
|
-- endpoint = "https://api.anthropic.com",
|
||||||
|
-- model = "claude-sonnet-4-20250514",
|
||||||
|
-- timeout = 30000, -- Timeout in milliseconds
|
||||||
|
-- extra_request_body = {
|
||||||
|
-- temperature = 0.75,
|
||||||
|
-- max_tokens = 20480,
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
-- moonshot = {
|
||||||
|
-- endpoint = "https://api.moonshot.ai/v1",
|
||||||
|
-- model = "kimi-k2-0711-preview",
|
||||||
|
-- timeout = 30000, -- Timeout in milliseconds
|
||||||
|
-- extra_request_body = {
|
||||||
|
-- temperature = 0.75,
|
||||||
|
-- max_tokens = 32768,
|
||||||
|
-- },
|
||||||
|
-- },
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
require('arduino-nvim').setup({
|
require('arduino-nvim').setup({
|
||||||
default_fqbn = "esp32:esp32:esp32",
|
default_fqbn = "esp32:esp32:esp32",
|
||||||
@@ -233,193 +249,3 @@ require('colorizer').setup({
|
|||||||
css_fn = true,
|
css_fn = true,
|
||||||
mode = 'background',
|
mode = 'background',
|
||||||
})
|
})
|
||||||
require('gitsigns').setup({
|
|
||||||
signs = {
|
|
||||||
add = { text = '┃' },
|
|
||||||
change = { text = '┃' },
|
|
||||||
delete = { text = '_' },
|
|
||||||
topdelete = { text = '‾' },
|
|
||||||
changedelete = { text = '~' },
|
|
||||||
untracked = { text = '┆' },
|
|
||||||
},
|
|
||||||
signs_staged = {
|
|
||||||
add = { text = '┃' },
|
|
||||||
change = { text = '┃' },
|
|
||||||
delete = { text = '_' },
|
|
||||||
topdelete = { text = '‾' },
|
|
||||||
changedelete = { text = '~' },
|
|
||||||
untracked = { text = '┆' },
|
|
||||||
},
|
|
||||||
signs_staged_enable = true,
|
|
||||||
signcolumn = true, -- Toggle with `:Gitsigns toggle_signs`
|
|
||||||
numhl = false, -- Toggle with `:Gitsigns toggle_numhl`
|
|
||||||
linehl = false, -- Toggle with `:Gitsigns toggle_linehl`
|
|
||||||
word_diff = false, -- Toggle with `:Gitsigns toggle_word_diff`
|
|
||||||
watch_gitdir = {
|
|
||||||
follow_files = true
|
|
||||||
},
|
|
||||||
auto_attach = true,
|
|
||||||
attach_to_untracked = false,
|
|
||||||
current_line_blame = false, -- Toggle with `:Gitsigns toggle_current_line_blame`
|
|
||||||
current_line_blame_opts = {
|
|
||||||
virt_text = true,
|
|
||||||
virt_text_pos = 'eol', -- 'eol' | 'overlay' | 'right_align'
|
|
||||||
delay = 1000,
|
|
||||||
ignore_whitespace = false,
|
|
||||||
virt_text_priority = 100,
|
|
||||||
use_focus = true,
|
|
||||||
},
|
|
||||||
current_line_blame_formatter = '<author>, <author_time:%R> - <summary>',
|
|
||||||
sign_priority = 6,
|
|
||||||
update_debounce = 100,
|
|
||||||
status_formatter = nil, -- Use default
|
|
||||||
max_file_length = 40000, -- Disable if file is longer than this (in lines)
|
|
||||||
preview_config = {
|
|
||||||
-- Options passed to nvim_open_win
|
|
||||||
style = 'minimal',
|
|
||||||
relative = 'cursor',
|
|
||||||
row = 0,
|
|
||||||
col = 1
|
|
||||||
},
|
|
||||||
})
|
|
||||||
require("remote-nvim").setup({
|
|
||||||
-- Configuration for devpod connections
|
|
||||||
devpod = {
|
|
||||||
binary = "devpod", -- Binary to use for devpod
|
|
||||||
docker_binary = "docker", -- Binary to use for docker-related commands
|
|
||||||
---@diagnostic disable-next-line:param-type-mismatch
|
|
||||||
-- ssh_config_path = utils.path_join(utils.is_windows, vim.fn.stdpath("data"), constants.PLUGIN_NAME, "ssh_config"), -- Path where devpod SSH configurations should be stored
|
|
||||||
search_style = "current_dir_only", -- How should devcontainers be searched
|
|
||||||
-- For dotfiles, see https://devpod.sh/docs/developing-in-workspaces/dotfiles-in-a-workspace for more information
|
|
||||||
dotfiles = {
|
|
||||||
path = nil, -- Path to your dotfiles which should be copied into devcontainers
|
|
||||||
install_script = nil -- Install script that should be called to install your dotfiles
|
|
||||||
},
|
|
||||||
gpg_agent_forwarding = false, -- Should GPG agent be forwarded over the network
|
|
||||||
container_list = "running_only", -- How should docker list containers ("running_only" or "all")
|
|
||||||
},
|
|
||||||
-- Configuration for SSH connections
|
|
||||||
ssh_config = {
|
|
||||||
ssh_binary = "ssh", -- Binary to use for running SSH command
|
|
||||||
scp_binary = "scp", -- Binary to use for running SSH copy commands
|
|
||||||
ssh_config_file_paths = { "$HOME/.ssh/config" }, -- Which files should be considered to contain the ssh host configurations. NOTE: `Include` is respected in the provided files.
|
|
||||||
|
|
||||||
-- These are useful for password-based SSH authentication.
|
|
||||||
-- It provides parsing pattern for the plugin to detect that an input is requested.
|
|
||||||
-- Each element contains the following attributes:
|
|
||||||
-- match - The string to match (plain matching is done)
|
|
||||||
-- type - Supports two values "plain"|"secret". Secret means when you provide the value, it should not be stored in the completion history of Neovim.
|
|
||||||
-- value - Default value for the prompt
|
|
||||||
-- value_type - "static"|"dynamic". For things like password, it would be needed for each new connection that the plugin initiates which could be obtrusive.
|
|
||||||
-- So, we save the value (only for current session's interval) to ease the process. If set to "dynamic", we do not save the value even for the session. You have to provide a fresh value each time.
|
|
||||||
ssh_prompts = {
|
|
||||||
{
|
|
||||||
match = "password:",
|
|
||||||
type = "secret",
|
|
||||||
value_type = "static",
|
|
||||||
value = "",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
match = "continue connecting (yes/no/[fingerprint])?",
|
|
||||||
type = "plain",
|
|
||||||
value_type = "static",
|
|
||||||
value = "",
|
|
||||||
},
|
|
||||||
-- There are other values here which can be checked in lua/remote-nvim/init.lua
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Path to the script that would be copied to the remote and called to ensure that neovim gets installed.
|
|
||||||
-- Default path is to the plugin's own ./scripts/neovim_install.sh file.
|
|
||||||
-- neovim_install_script_path = utils.path_join(
|
|
||||||
-- utils.is_windows,
|
|
||||||
-- vim.fn.fnamemodify(debug.getinfo(1).source:sub(2), ":h:h:h"),
|
|
||||||
-- "scripts",
|
|
||||||
-- "neovim_install.sh"
|
|
||||||
-- ),
|
|
||||||
|
|
||||||
-- Modify the UI for the plugin's progress viewer.
|
|
||||||
-- type can be "split" or "popup". All options from https://github.com/MunifTanjim/nui.nvim/tree/main/lua/nui/popup and https://github.com/MunifTanjim/nui.nvim/tree/main/lua/nui/split are supported.
|
|
||||||
-- Note that some options like "border" are only available for "popup".
|
|
||||||
progress_view = {
|
|
||||||
type = "popup",
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
-- Offline mode configuration. For more details, see the "Offline mode" section below.
|
|
||||||
offline_mode = {
|
|
||||||
-- Should offline mode be enabled?
|
|
||||||
enabled = false,
|
|
||||||
-- Do not connect to GitHub at all. Not even to get release information.
|
|
||||||
no_github = false,
|
|
||||||
-- What path should be looked at to find locally available releases
|
|
||||||
-- cache_dir = utils.path_join(utils.is_windows, vim.fn.stdpath("cache"), constants.PLUGIN_NAME, "version_cache"),
|
|
||||||
},
|
|
||||||
|
|
||||||
-- Remote configuration
|
|
||||||
remote = {
|
|
||||||
app_name = "nvim", -- This directly maps to the value NVIM_APPNAME. If you use any other paths for configuration, also make sure to set this.
|
|
||||||
-- List of directories that should be copied over
|
|
||||||
copy_dirs = {
|
|
||||||
-- What to copy to remote's Neovim config directory
|
|
||||||
config = {
|
|
||||||
base = vim.fn.stdpath("config"), -- Path from where data has to be copied
|
|
||||||
dirs = "*", -- Directories that should be copied over. "*" means all directories. To specify a subset, use a list like {"lazy", "mason"} where "lazy", "mason" are subdirectories
|
|
||||||
-- under path specified in `base`.
|
|
||||||
compression = {
|
|
||||||
enabled = false, -- Should compression be enabled or not
|
|
||||||
additional_opts = {} -- Any additional options that should be used for compression. Any argument that is passed to `tar` (for compression) can be passed here as separate elements.
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- What to copy to remote's Neovim data directory
|
|
||||||
data = {
|
|
||||||
base = vim.fn.stdpath("data"),
|
|
||||||
dirs = {},
|
|
||||||
compression = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- What to copy to remote's Neovim cache directory
|
|
||||||
cache = {
|
|
||||||
base = vim.fn.stdpath("cache"),
|
|
||||||
dirs = {},
|
|
||||||
compression = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
-- What to copy to remote's Neovim state directory
|
|
||||||
state = {
|
|
||||||
base = vim.fn.stdpath("state"),
|
|
||||||
dirs = {},
|
|
||||||
compression = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
|
|
||||||
-- You can supply your own callback that should be called to create the local client. This is the default implementation.
|
|
||||||
-- Two arguments are passed to the callback:
|
|
||||||
-- port: Local port at which the remote server is available
|
|
||||||
-- workspace_config: Workspace configuration for the host. For all the properties available, see https://github.com/amitds1997/remote-nvim.nvim/blob/main/lua/remote-nvim/providers/provider.lua#L4
|
|
||||||
-- A sample implementation using WezTerm tab is at: https://github.com/amitds1997/remote-nvim.nvim/wiki/Configuration-recipes
|
|
||||||
client_callback = function(port, _)
|
|
||||||
require("remote-nvim.ui").float_term(("nvim --server localhost:%s --remote-ui"):format(port), function(exit_code)
|
|
||||||
if exit_code ~= 0 then
|
|
||||||
vim.notify(("Local client failed with exit code %s"):format(exit_code), vim.log.levels.ERROR)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
end,
|
|
||||||
|
|
||||||
-- Plugin log related configuration [PREFER NOT TO CHANGE THIS]
|
|
||||||
log = {
|
|
||||||
-- Where is the log file
|
|
||||||
-- filepath = utils.path_join(utils.is_windows, vim.fn.stdpath("state"), ("%s.log"):format(constants.PLUGIN_NAME)),
|
|
||||||
-- Level of logging
|
|
||||||
level = "info",
|
|
||||||
-- At what size, should we truncate the logs
|
|
||||||
max_size = 1024 * 1024 * 2, -- 2MB
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,10 @@
|
|||||||
-- local configs = require('nvim-treesitter.configs')
|
local configs = require('nvim-treesitter.configs')
|
||||||
require'nvim-treesitter'.setup({
|
configs.setup({
|
||||||
ensure_installed = {
|
-- ensure_installed = {
|
||||||
"ini", "bash", "c", "lua", "vim", "vimdoc", "query", "python",
|
-- "ini", "bash", "c", "lua", "vim", "vimdoc", "query", "python",
|
||||||
"rust", "zig", "typescript", "svelte", "css", "html", "nix"
|
-- "rust", "zig", "typescript", "svelte", "css", "html", "nix"
|
||||||
},
|
-- },
|
||||||
sync_install = true,
|
sync_install = false,
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = true, disable = { "norg" }, },
|
indent = { enable = true, disable = { "norg" }, },
|
||||||
incremental_selection = { enable = true },
|
incremental_selection = { enable = true },
|
||||||
|
|||||||
Reference in New Issue
Block a user