christopher/neovim
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add rest of settings

Browse Source
This commit is contained in:
Christopher Williams
2026-05-16 11:42:20 -04:00
parent 11932ebf7f
commit 63c4fcc16c
18 changed files with 465 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lua/plugins/ai.lua
+12 -11
View File
@@ -13,12 +13,12 @@ local M = {
enabled = true,
auto_trigger = true,
keymap = {
accept = "<M-j>",
accept_line = "<M-l>",
accept_word = "<M-k>",
next = "<M-]>",
prev = "<M-[>",
dismiss = "<M-c>",
accept = "<C-j>",
accept_line = "<C-l>",
accept_word = "<C-k>",
-- next = "<C-]>",
-- prev = "<C-[>",
dismiss = "<C-c>",
},
},
nes = {
@@ -52,12 +52,13 @@ local M = {
end,
},
{
"CopilotC-Nvim/CopilotChat.nvim",
dependencies = {
{ "nvim-lua/plenary.nvim", branch = "master" },
},
build = "make tiktoken",
"olimorris/codecompanion.nvim",
version = "^19.0.0",
opts = {},
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-treesitter/nvim-treesitter",
},
},
}
lua/plugins/appearance.lua
+72 -2
View File
@@ -5,14 +5,84 @@ local M = {
priority = 1000,
opts = {},
},
{
"gmr458/vscode_modern_theme.nvim",
lazy = false,
priority = 1000,
config = function()
require("vscode_modern").setup({
cursorline = true,
transparent_background = false,
nvim_tree_darker = true,
})
vim.cmd.colorscheme("vscode_modern")
end,
},
{ "nvim-tree/nvim-web-devicons", opts = {} },
{
"https://github.com/nvim-lualine/lualine.nvim",
event = "VeryLazy",
config = function()
require("lualine").setup()
local function window_number()
return vim.api.nvim_win_get_number(0)
end
require("lualine").setup({
options = {
icons_enabled = true,
theme = "auto",
component_separators = { left = "", right = "" },
section_separators = { left = "", right = "" },
disabled_filetypes = {
statusline = {},
winbar = {},
},
ignore_focus = {},
always_divide_middle = true,
always_show_tabline = true,
globalstatus = false,
refresh = {
statusline = 1000,
tabline = 1000,
winbar = 1000,
refresh_time = 16, -- ~60fps
events = {
"WinEnter",
"BufEnter",
"BufWritePost",
"SessionLoadPost",
"FileChangedShellPost",
"VimResized",
"Filetype",
"CursorMoved",
"CursorMovedI",
"ModeChanged",
},
},
},
sections = {
lualine_a = { "mode" },
lualine_b = { "branch", "diff", "diagnostics" },
lualine_c = { "filename" },
lualine_x = { "encoding", "fileformat", "filetype" },
lualine_y = { window_number, "progress" },
lualine_z = { "location" },
},
inactive_sections = {
lualine_a = {},
lualine_b = {},
lualine_c = { "filename" },
lualine_x = { window_number, "location" },
lualine_y = {},
lualine_z = {},
},
tabline = {},
winbar = {},
inactive_winbar = {},
extensions = {},
})
end,
},
}
return M
return M
lua/plugins/dap.lua
+27
View File
@@ -0,0 +1,27 @@
local M = {
{
"mfussenegger/nvim-dap",
lazy = true,
dependencies = {
"rcarriga/nvim-dap-ui",
},
keys = {
{
"<leader>d",
function()
require("dap").toggle_breakpoint()
end,
},
{
"<leader>c",
function()
require("dap").continue()
end,
},
},
config = function()
require("dapui").setup()
end,
},
}
return M
lua/plugins/editor.lua
+27 -13
View File
@@ -56,6 +56,16 @@ local M = {
require("Comment").setup()
end,
},
{
"Aasim-A/scrollEOF.nvim",
event = { "CursorMoved", "WinScrolled" },
opts = {},
},
{
"folke/todo-comments.nvim",
dependencies = { "nvim-lua/plenary.nvim" },
opts = {}
},
{
"folke/flash.nvim",
event = "VeryLazy",
@@ -101,19 +111,23 @@ local M = {
desc = "Toggle Flash Search",
},
},
config = function()
require("flash").setup({
modes = {
search = {
enabled = true,
},
char = {
enabled = true,
jump_labels = true,
},
}
})
end,
config = function()
require("flash").setup({
modes = {
search = {
enabled = true,
},
char = {
enabled = true,
jump_labels = true,
multi_line = false,
jump = {
autojump = true,
},
},
},
})
end,
},
{
"folke/snacks.nvim",
lua/plugins/git.lua
+24 -1
View File
@@ -11,6 +11,29 @@ local M = {
{ "<leader>gg", "<cmd>Neogit<cr>", desc = "Show Neogit UI" },
},
},
{
"esmuellert/codediff.nvim",
dependencies = { "MunifTanjim/nui.nvim" },
cmd = "CodeDiff",
},
{
"lewis6991/gitsigns.nvim",
},
{
"akinsho/git-conflict.nvim",
version = "*",
config = function()
require("git-conflict").setup({
default_mappings = true, -- disable buffer local mapping created by this plugin
default_commands = true, -- disable commands created by this plugin
disable_diagnostics = true, -- This will disable the diagnostics in a buffer whilst it is conflicted
highlights = {
incoming = "DiffText",
current = "DiffAdd",
},
})
end,
},
}
return M
return M
lua/plugins/haunt.lua
+84
View File
@@ -0,0 +1,84 @@
local M = {
{
"TheNoeTrevino/haunt.nvim",
-- default config: change to your liking, or remove it to use defaults
---@class HauntConfig
opts = {
sign = "󱙝",
sign_hl = "DiagnosticInfo",
virt_text_hl = "HauntAnnotation", -- links to DiagnosticVirtualTextHint
annotation_prefix = " 󰆉 ",
annotation_suffix = "",
line_hl = nil,
virt_text_pos = "eol",
data_dir = nil,
per_branch_bookmarks = true,
picker = "auto", -- "auto", "snacks", "telescope", or "fzf"
picker_keys = { -- picker agnostic, we got you covered
delete = { key = "d", mode = { "n" } },
edit_annotation = { key = "a", mode = { "n" } },
},
},
-- recommended keymaps, with a helpful prefix alias
init = function()
local haunt = require("haunt.api")
local haunt_picker = require("haunt.picker")
local map = vim.keymap.set
local prefix = "<leader>h"
-- annotations
map("n", prefix .. "a", function()
haunt.annotate()
end, { desc = "Annotate" })
map("n", prefix .. "t", function()
haunt.toggle_annotation()
end, { desc = "Toggle annotation" })
map("n", prefix .. "T", function()
haunt.toggle_all_lines()
end, { desc = "Toggle all annotations" })
map("n", prefix .. "d", function()
haunt.delete()
end, { desc = "Delete bookmark" })
map("n", prefix .. "C", function()
haunt.clear_all()
end, { desc = "Delete all bookmarks" })
-- move
map("n", prefix .. "p", function()
haunt.prev()
end, { desc = "Previous bookmark" })
map("n", prefix .. "n", function()
haunt.next()
end, { desc = "Next bookmark" })
-- picker
map("n", prefix .. "l", function()
haunt_picker.show()
end, { desc = "Show Picker" })
-- quickfix
map("n", prefix .. "q", function()
haunt.to_quickfix()
end, { desc = "Send Hauntings to QF Lix (buffer)" })
map("n", prefix .. "Q", function()
haunt.to_quickfix({ current_buffer = true })
end, { desc = "Send Hauntings to QF Lix (all)" })
-- yank
map("n", prefix .. "y", function()
haunt.yank_locations({ current_buffer = true })
end, { desc = "Send Hauntings to Clipboard (buffer)" })
map("n", prefix .. "Y", function()
haunt.yank_locations()
end, { desc = "Send Hauntings to Clipboard (all)" })
end,
},
}
return M
lua/plugins/lsp.lua
+86 -16
View File
@@ -7,8 +7,69 @@ local M = {
vim.lsp.enable("luals")
vim.lsp.enable("sqls")
vim.lsp.enable("ty")
vim.lsp.enable("svelte")
-- Setup gopls with inlay hints
vim.lsp.config("gopls", {
settings = {
gopls = {
hints = {
assignVariableTypes = true,
compositeLiteralFields = true,
compositeLiteralTypes = true,
constantValues = true,
functionTypeParameters = true,
parameterNames = true,
rangeVariableTypes = true,
},
},
},
})
vim.lsp.enable("gopls")
end,
},
{
"mfussenegger/nvim-jdtls",
config = function()
local config = {
cmd = {
"java",
"-Xmx20g",
"-Xms1g",
"-Declipse.application=org.eclipse.jdt.ls.core.id1",
},
}
vim.lsp.enable("jdtls")
end,
},
{
"ray-x/go.nvim",
dependencies = {
"ray-x/guihua.lua",
"neovim/nvim-lspconfig",
},
opts = {
lsp_inlay_hints = {
enable = true, -- This tells go.nvim to manage the Neovim-side toggle
},
},
config = function(_, opts)
require("go").setup(opts)
-- Custom autocommands should go here
local format_sync_grp = vim.api.nvim_create_augroup("GoFormat", {})
vim.api.nvim_create_autocmd("BufWritePre", {
pattern = "*.go",
callback = function()
require("go.format").goimports()
end,
group = format_sync_grp,
})
end,
event = { "CmdlineEnter" },
ft = { "go", "gomod" },
},
{
"saghen/blink.cmp",
dependencies = { "rafamadriz/friendly-snippets" },
@@ -51,9 +112,9 @@ local M = {
sources = {
-- add lazydev to your completion providers
default = { "lazydev", "lsp", "path", "snippets", "buffer" },
per_filetype = {
org = { "orgmode" }
},
per_filetype = {
org = { "orgmode" },
},
providers = {
lazydev = {
name = "LazyDev",
@@ -61,11 +122,11 @@ local M = {
-- make lazydev completions top priority (see `:h blink.cmp`)
score_offset = 100,
},
orgmode = {
name = "Orgmode",
module = "orgmode.org.autocompletion.blink",
fallbacks = { "buffer" },
}
orgmode = {
name = "Orgmode",
module = "orgmode.org.autocompletion.blink",
fallbacks = { "buffer" },
},
},
},
@@ -75,9 +136,14 @@ local M = {
--
-- See the fuzzy documentation for more information
fuzzy = { implementation = "prefer_rust_with_warning" },
signature = { enabled = true },
},
opts_extend = { "sources.default" },
},
{
"mason-org/mason.nvim",
opts = {},
},
{
"folke/lazydev.nvim",
ft = "lua",
@@ -112,15 +178,19 @@ local M = {
})
end
require("ufo").setup({
provider_selector = function(bufnr, filetype, buftype)
local ftMap = {
org = "treesitter",
}
return ftMap[filetype] or {"treesitter", "indent"}
end
})
provider_selector = function(bufnr, filetype, buftype)
local ftMap = {
org = "treesitter",
}
return ftMap[filetype] or { "treesitter", "indent" }
end,
})
end,
}
},
{
"dnlhc/glance.nvim",
cmd = "Glance",
},
}
return M
lua/plugins/treesitter.lua
+3
View File
@@ -1,6 +1,7 @@
local M = {
{
"nvim-treesitter/nvim-treesitter",
branch = "main",
build = ":TSUpdate",
config = function()
local ensureInstalled = {
@@ -10,6 +11,7 @@ local M = {
"typescript",
"java",
"go",
"java",
"rust",
"html",
"css",
@@ -17,6 +19,7 @@ local M = {
"yaml",
"markdown",
"sql",
"svelte",
"org",
}
local alreadyInstalled = require("nvim-treesitter.config").get_installed()