Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions dictionary/markdown-claude.dict
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
/openspec:proposal
/openspec:apply
/openspec:archive
2 changes: 2 additions & 0 deletions dictionary/markdown.dict
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Conner
Ohnesorge
1 change: 1 addition & 0 deletions dictionary/words.dict
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ohnesorge
28 changes: 26 additions & 2 deletions lua/plugins/blink-cmp-plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@ return {
"saghen/blink.cmp",
version = 'v1.2.0',
dependencies = {
{ 'echasnovski/mini.nvim', version = false }
{ 'echasnovski/mini.nvim', version = false },
{
'Kaiser-Yang/blink-cmp-dictionary',
dependencies = { 'nvim-lua/plenary.nvim' }
}
},
---@module 'blink.cmp'
---@type blink.cmp.Config
Expand All @@ -13,14 +17,34 @@ return {
},
},
sources = {
default = { "path", "lsp", "snippets", "buffer", "lazydev" },
default = { "dictionary", "path", "lsp", "snippets", "buffer", "lazydev" },

providers = {
-- dont show LuaLS require statements when lazydev has items
lsp = {
fallbacks = { "path", "buffer", "snippets" },
},
lazydev = { name = "LazyDev", module = "lazydev.integrations.blink", fallbacks = { "lsp" } },
dictionary = {
module = 'blink-cmp-dictionary',
name = 'Dict',
-- Make sure this is at least 2.
-- 3 is recommended
min_keyword_length = 3,
opts = {
dictionary_files = function()
if vim.bo.filetype == 'markdown' then
local bufname = vim.api.nvim_buf_get_name(0)
if bufname:match("^/tmp/claude%-prompt%-.+%.md$") then
return { vim.fn.expand('~/.config/nvim/dictionary/markdown-claude.dict') }
end
return { vim.fn.expand('~/.config/nvim/dictionary/markdown.dict') }
end
return { vim.fn.expand('~/.config/nvim/dictionary/words.dict') }
end,
-- options for blink-cmp-dictionary
}
}
},
},
enabled = function()
Expand Down
4 changes: 2 additions & 2 deletions lua/plugins/lspconfig-plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,8 @@ return {
}
},
-- elmls = {},
basedpyright = {},
-- pyrefly = {},
-- basedpyright = {},
pyrefly = {},
protols = {
single_file_support = false,
cmd = { "protols", "--include-paths=/home/connerohnesorge/Documents/002Orgs/pegwings/pegwings/proto/lib,/home/connerohnesorge/Documents/002Orgs/pegwings/pegwings/proto/src" },
Expand Down
52 changes: 11 additions & 41 deletions lua/plugins/neotest-plugin.lua
Original file line number Diff line number Diff line change
@@ -1,49 +1,29 @@
return {
"nvim-neotest/neotest",
dependencies = {
"nvim-neotest/neotest-go",
-- "lawrence-laz/neotest-zig",
{
"fredrikaverpil/neotest-golang",
version = "*", -- Optional, but recommended; track releases
},
"rouge8/neotest-rust",
-- "arthur944/neotest-bun",
"nvim-neotest/neotest-python",
"antoinemadec/FixCursorHold.nvim",
"nvim-treesitter/nvim-treesitter",
"nvim-lua/plenary.nvim",
"nvim-neotest/nvim-nio",
-- 'thenbe/neotest-playwright',
},
opts = {
log_level = vim.log.levels.TRACE,
adapters = {
-- ["neotest-zig"] = {
-- dap = {
-- adapter = "lldb",
-- },
-- },
-- ["neotest-playwright"] = {
-- options = {
-- persist_project_selection = true,
-- enable_dynamic_test_discovery = true,
-- },
-- },
-- ["neotest-bun"] = {
-- },
["neotest-rust"] = {
dap = {
adapter = "lldb",
},
},
["neotest-python"] = {
dap = { justMyCode = false },
args = { "--log-level", "DEBUG" },
runner = "pytest",
is_test_file = function(file_path)
return file_path:match("test_.*%.py") or file_path:match(".*_test%.py")
end,
},
["neotest-go"] = {
runner = "go test",
experimental = {
test_table = true,
["neotest-golang"] = {
runner = "gotestsum",
go_test_args = {
"-v",
},
args = { "-count=1", "-timeout=60s", "-v" }
},
},
status = { virtual_text = true },
Expand Down Expand Up @@ -97,23 +77,13 @@ return {
end

require("neotest").setup(opts)

vim.api.nvim_set_keymap("n", "<leader>td", ":lua require('neotest').run.run({strategy = 'dap'})<CR>", {
noremap = true,
silent = true
})
end,
keys = {
{
"<leader>tf",
function() require("neotest").run.run(vim.fn.expand("%")) end,
desc = "Run File"
},
{
"<leader>tT",
function() require("neotest").run.run(vim.loop.cwd()) end,
desc = "Run All Test Files"
},
{
"<leader>tr",
function() require("neotest").run.run() end,
Expand Down
72 changes: 36 additions & 36 deletions lua/plugins/obsidian-plugin.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,42 +48,42 @@ return {
},

---@return table
note_frontmatter_func = function(note)
-- Add the title of the note as an alias.
if note.title then
note:add_alias(note.title)
end


local out = { id = note.id, aliases = note.aliases, tags = note.tags }

-- `note.metadata` contains any manually added fields in the frontmatter.
-- So here we just make sure those fields are kept in the frontmatter.
if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
for k, v in pairs(note.metadata) do
out[k] = v
end
end

-- Add the created date of the note as an alias if not already present.
if not out.created_at then
out.created_at = getCurrentTimeRFC3339()
end

-- title is required for the note to be saved. (default: {filename})
if not out.title then
out.title = note.title
end

-- description is required for the note to be saved. (default: {filename})
if not out.description then
out.description = note.title
end

out.updated_at = getCurrentTimeRFC3339()

return out
end,
-- note_frontmatter_func = function(note)
-- -- Add the title of the note as an alias.
-- if note.title then
-- note:add_alias(note.title)
-- end
--
--
-- local out = { id = note.id, aliases = note.aliases, tags = note.tags }
--
-- -- `note.metadata` contains any manually added fields in the frontmatter.
-- -- So here we just make sure those fields are kept in the frontmatter.
-- if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
-- for k, v in pairs(note.metadata) do
-- out[k] = v
-- end
-- end
--
-- -- Add the created date of the note as an alias if not already present.
-- if not out.created_at then
-- out.created_at = getCurrentTimeRFC3339()
-- end
--
-- -- title is required for the note to be saved. (default: {filename})
-- if not out.title then
-- out.title = note.title
-- end
--
-- -- description is required for the note to be saved. (default: {filename})
-- if not out.description then
-- out.description = note.title
-- end
--
-- out.updated_at = getCurrentTimeRFC3339()
--
-- return out
-- end,
},
completion = {
-- Set to false to disable completion.
Expand Down
3 changes: 2 additions & 1 deletion lua/plugins/telescope-plugin.lua
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
return {
'nvim-telescope/telescope.nvim',
branch = '0.1.x',
-- tag = '0.1.9',
ref = '84b9ba066d1860f7a586ce9cd732fd6c4f77d1d9',
event = 'BufWinEnter',
dependencies = {
'nvim-telescope/telescope-media-files.nvim',
Expand Down
62 changes: 32 additions & 30 deletions lua/plugins/tree-sitter-plugin.lua
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
return {
"nvim-treesitter/nvim-treesitter",
version = false,
branch = "main",
build = ":TSUpdate",
event = { "BufReadPost", "BufNewFile" },
dependencies = {
{
"nvim-treesitter/nvim-treesitter-textobjects",
branch = "main",
init = function()
-- disable rtp plugin, as we only need its queries for mini.ai
-- In case other textobject modules are enabled, we will load them
Expand All @@ -14,35 +16,35 @@ return {
vim.g.load_textobjects = true
end,
},
{
"nvim-treesitter/nvim-treesitter-context",
config = function()
require("treesitter-context").setup {
-- Enable this plugin (Can be enabled/disabled later via commands)
enable = true,
-- Enable multiwindow support.
multiwindow = false,
-- How many lines the window should span. Values <= 0 mean no limit.
max_lines = 8,
-- Minimum editor window height to enable context. Values <= 0 mean no limit.
min_window_height = 0,
line_numbers = true,
-- Maximum number of lines to show for a single context
multiline_threshold = 20,
-- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
trim_scope = '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,
-- The Z-index of the context window
zindex = 20,
-- (fun(buf: integer): boolean) return false to disable attaching
on_attach = nil,
}
end,
},
{ 'nvim-treesitter/playground' }
-- {
-- "nvim-treesitter/nvim-treesitter-context",
-- config = function()
-- require("treesitter-context").setup {
-- -- Enable this plugin (Can be enabled/disabled later via commands)
-- enable = true,
-- -- Enable multiwindow support.
-- multiwindow = false,
-- -- How many lines the window should span. Values <= 0 mean no limit.
-- max_lines = 8,
-- -- Minimum editor window height to enable context. Values <= 0 mean no limit.
-- min_window_height = 0,
-- line_numbers = true,
-- -- Maximum number of lines to show for a single context
-- multiline_threshold = 20,
-- -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
-- trim_scope = '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,
-- -- The Z-index of the context window
-- zindex = 20,
-- -- (fun(buf: integer): boolean) return false to disable attaching
-- on_attach = nil,
-- }
-- end,
-- },
-- { 'nvim-treesitter/playground' }
},
cmd = { "TSUpdateSync" },
keys = {
Expand Down Expand Up @@ -175,6 +177,6 @@ return {
},
config = function(_, opts)
---@diagnostic disable-next-line: missing-fields
require 'nvim-treesitter.configs'.setup(opts)
require 'nvim-treesitter'.setup(opts)
end,
}