Skip to content

Commit e7af98a

Browse files
latest
1 parent 81129bf commit e7af98a

4 files changed

Lines changed: 76 additions & 106 deletions

File tree

lua/plugins/lspconfig-plugin.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,8 @@ return {
9999
}
100100
},
101101
-- elmls = {},
102-
basedpyright = {},
103-
-- pyrefly = {},
102+
-- basedpyright = {},
103+
pyrefly = {},
104104
protols = {
105105
single_file_support = false,
106106
cmd = { "protols", "--include-paths=/home/connerohnesorge/Documents/002Orgs/pegwings/pegwings/proto/lib,/home/connerohnesorge/Documents/002Orgs/pegwings/pegwings/proto/src" },

lua/plugins/neotest-plugin.lua

Lines changed: 6 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,25 @@ return {
55
"fredrikaverpil/neotest-golang",
66
version = "*", -- Optional, but recommended; track releases
77
},
8-
"lawrence-laz/neotest-zig",
98
"rouge8/neotest-rust",
10-
build = function()
11-
vim.system({ "go", "install", "gotest.tools/gotestsum@latest" }):wait() -- Optional, but recommended
12-
end,
13-
"arthur944/neotest-bun",
14-
"nvim-neotest/neotest-python",
9+
"antoinemadec/FixCursorHold.nvim",
10+
"nvim-treesitter/nvim-treesitter",
11+
"nvim-lua/plenary.nvim",
1512
"nvim-neotest/nvim-nio",
16-
'thenbe/neotest-playwright',
1713
},
1814
opts = {
1915
log_level = vim.log.levels.TRACE,
2016
adapters = {
21-
["neotest-zig"] = {
22-
dap = {
23-
adapter = "lldb",
24-
},
25-
},
26-
["neotest-playwright"] = {
27-
options = {
28-
persist_project_selection = true,
29-
enable_dynamic_test_discovery = true,
30-
},
31-
},
32-
["neotest-bun"] = {
33-
},
3417
["neotest-rust"] = {
3518
dap = {
3619
adapter = "lldb",
3720
},
3821
},
39-
["neotest-python"] = {
40-
dap = { justMyCode = false },
41-
args = { "--log-level", "DEBUG" },
42-
runner = "pytest",
43-
is_test_file = function(file_path)
44-
return file_path:match("test_.*%.py") or file_path:match(".*_test%.py")
45-
end,
46-
},
4722
["neotest-golang"] = {
4823
runner = "gotestsum",
24+
go_test_args = {
25+
"-v",
26+
},
4927
},
5028
},
5129
status = { virtual_text = true },
@@ -99,23 +77,13 @@ return {
9977
end
10078

10179
require("neotest").setup(opts)
102-
103-
vim.api.nvim_set_keymap("n", "<leader>td", ":lua require('neotest').run.run({strategy = 'dap'})<CR>", {
104-
noremap = true,
105-
silent = true
106-
})
10780
end,
10881
keys = {
10982
{
11083
"<leader>tf",
11184
function() require("neotest").run.run(vim.fn.expand("%")) end,
11285
desc = "Run File"
11386
},
114-
{
115-
"<leader>tT",
116-
function() require("neotest").run.run(vim.loop.cwd()) end,
117-
desc = "Run All Test Files"
118-
},
11987
{
12088
"<leader>tr",
12189
function() require("neotest").run.run() end,

lua/plugins/obsidian-plugin.lua

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -48,42 +48,42 @@ return {
4848
},
4949

5050
---@return table
51-
note_frontmatter_func = function(note)
52-
-- Add the title of the note as an alias.
53-
if note.title then
54-
note:add_alias(note.title)
55-
end
56-
57-
58-
local out = { id = note.id, aliases = note.aliases, tags = note.tags }
59-
60-
-- `note.metadata` contains any manually added fields in the frontmatter.
61-
-- So here we just make sure those fields are kept in the frontmatter.
62-
if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
63-
for k, v in pairs(note.metadata) do
64-
out[k] = v
65-
end
66-
end
67-
68-
-- Add the created date of the note as an alias if not already present.
69-
if not out.created_at then
70-
out.created_at = getCurrentTimeRFC3339()
71-
end
72-
73-
-- title is required for the note to be saved. (default: {filename})
74-
if not out.title then
75-
out.title = note.title
76-
end
77-
78-
-- description is required for the note to be saved. (default: {filename})
79-
if not out.description then
80-
out.description = note.title
81-
end
82-
83-
out.updated_at = getCurrentTimeRFC3339()
84-
85-
return out
86-
end,
51+
-- note_frontmatter_func = function(note)
52+
-- -- Add the title of the note as an alias.
53+
-- if note.title then
54+
-- note:add_alias(note.title)
55+
-- end
56+
--
57+
--
58+
-- local out = { id = note.id, aliases = note.aliases, tags = note.tags }
59+
--
60+
-- -- `note.metadata` contains any manually added fields in the frontmatter.
61+
-- -- So here we just make sure those fields are kept in the frontmatter.
62+
-- if note.metadata ~= nil and not vim.tbl_isempty(note.metadata) then
63+
-- for k, v in pairs(note.metadata) do
64+
-- out[k] = v
65+
-- end
66+
-- end
67+
--
68+
-- -- Add the created date of the note as an alias if not already present.
69+
-- if not out.created_at then
70+
-- out.created_at = getCurrentTimeRFC3339()
71+
-- end
72+
--
73+
-- -- title is required for the note to be saved. (default: {filename})
74+
-- if not out.title then
75+
-- out.title = note.title
76+
-- end
77+
--
78+
-- -- description is required for the note to be saved. (default: {filename})
79+
-- if not out.description then
80+
-- out.description = note.title
81+
-- end
82+
--
83+
-- out.updated_at = getCurrentTimeRFC3339()
84+
--
85+
-- return out
86+
-- end,
8787
},
8888
completion = {
8989
-- Set to false to disable completion.

lua/plugins/tree-sitter-plugin.lua

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
return {
22
"nvim-treesitter/nvim-treesitter",
33
version = false,
4+
branch = "main",
45
build = ":TSUpdate",
56
event = { "BufReadPost", "BufNewFile" },
67
dependencies = {
78
{
89
"nvim-treesitter/nvim-treesitter-textobjects",
10+
branch = "main",
911
init = function()
1012
-- disable rtp plugin, as we only need its queries for mini.ai
1113
-- In case other textobject modules are enabled, we will load them
@@ -14,35 +16,35 @@ return {
1416
vim.g.load_textobjects = true
1517
end,
1618
},
17-
{
18-
"nvim-treesitter/nvim-treesitter-context",
19-
config = function()
20-
require("treesitter-context").setup {
21-
-- Enable this plugin (Can be enabled/disabled later via commands)
22-
enable = true,
23-
-- Enable multiwindow support.
24-
multiwindow = false,
25-
-- How many lines the window should span. Values <= 0 mean no limit.
26-
max_lines = 8,
27-
-- Minimum editor window height to enable context. Values <= 0 mean no limit.
28-
min_window_height = 0,
29-
line_numbers = true,
30-
-- Maximum number of lines to show for a single context
31-
multiline_threshold = 20,
32-
-- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
33-
trim_scope = 'outer',
34-
mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
35-
-- Separator between context and content. Should be a single character string, like '-'.
36-
-- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
37-
separator = nil,
38-
-- The Z-index of the context window
39-
zindex = 20,
40-
-- (fun(buf: integer): boolean) return false to disable attaching
41-
on_attach = nil,
42-
}
43-
end,
44-
},
45-
{ 'nvim-treesitter/playground' }
19+
-- {
20+
-- "nvim-treesitter/nvim-treesitter-context",
21+
-- config = function()
22+
-- require("treesitter-context").setup {
23+
-- -- Enable this plugin (Can be enabled/disabled later via commands)
24+
-- enable = true,
25+
-- -- Enable multiwindow support.
26+
-- multiwindow = false,
27+
-- -- How many lines the window should span. Values <= 0 mean no limit.
28+
-- max_lines = 8,
29+
-- -- Minimum editor window height to enable context. Values <= 0 mean no limit.
30+
-- min_window_height = 0,
31+
-- line_numbers = true,
32+
-- -- Maximum number of lines to show for a single context
33+
-- multiline_threshold = 20,
34+
-- -- Which context lines to discard if `max_lines` is exceeded. Choices: 'inner', 'outer'
35+
-- trim_scope = 'outer',
36+
-- mode = 'cursor', -- Line used to calculate context. Choices: 'cursor', 'topline'
37+
-- -- Separator between context and content. Should be a single character string, like '-'.
38+
-- -- When separator is set, the context will only show up when there are at least 2 lines above cursorline.
39+
-- separator = nil,
40+
-- -- The Z-index of the context window
41+
-- zindex = 20,
42+
-- -- (fun(buf: integer): boolean) return false to disable attaching
43+
-- on_attach = nil,
44+
-- }
45+
-- end,
46+
-- },
47+
-- { 'nvim-treesitter/playground' }
4648
},
4749
cmd = { "TSUpdateSync" },
4850
keys = {
@@ -175,6 +177,6 @@ return {
175177
},
176178
config = function(_, opts)
177179
---@diagnostic disable-next-line: missing-fields
178-
require 'nvim-treesitter.configs'.setup(opts)
180+
require 'nvim-treesitter'.setup(opts)
179181
end,
180182
}

0 commit comments

Comments
 (0)