+7
-7
after/queries/go/injections.scm
+7
-7
after/queries/go/injections.scm
···
2
2
3
3
;; sql
4
4
((call_expression
5
-
(selector_expression
6
-
field: (field_identifier) @_field
7
-
(#any-of? @_field "Exec" "ExecContext" "Query" "QueryContext" "QueryRow" "QueryRowContext"))
8
-
(argument_list [(interpreted_string_literal)
9
-
(raw_string_literal)] @injection.content))
10
-
(#offset! @injection.content 0 1 0 -1)
11
-
(#set! injection.language "sql"))
5
+
(selector_expression
6
+
field: (field_identifier) @_field
7
+
(#any-of? @_field "Exec" "ExecContext" "Query" "QueryContext" "QueryRow" "QueryRowContext"))
8
+
(argument_list [(interpreted_string_literal)
9
+
(raw_string_literal)] @injection.content))
10
+
(#offset! @injection.content 0 1 0 -1)
11
+
(#set! injection.language "sql"))
12
12
13
13
([(raw_string_literal)
14
14
(interpreted_string_literal)] @injection.content
+10
-10
after/queries/lua/injections.scm
+10
-10
after/queries/lua/injections.scm
···
2
2
3
3
;; MiniTest
4
4
((function_call
5
-
name: (_) @_vimcmd_identifier
6
-
arguments: (arguments
7
-
(string
8
-
content: _ @injection.content)))
9
-
(#set! injection.language "lua")
10
-
(#any-of? @_vimcmd_identifier "child.lua" "c.lua"))
5
+
name: (_) @_vimcmd_identifier
6
+
arguments: (arguments
7
+
(string
8
+
content: _ @injection.content)))
9
+
(#set! injection.language "lua")
10
+
(#any-of? @_vimcmd_identifier "child.lua" "c.lua"))
11
11
12
12
((function_call
13
-
name: (_) @_vimcmd_identifier
14
-
arguments: (arguments (string content: _ @injection.content)))
15
-
(#set! injection.language "vim")
16
-
(#any-of? @_vimcmd_identifier "child.cmd" "c.cmd"))
13
+
name: (_) @_vimcmd_identifier
14
+
arguments: (arguments (string content: _ @injection.content)))
15
+
(#set! injection.language "vim")
16
+
(#any-of? @_vimcmd_identifier "child.cmd" "c.cmd"))
-15
after/queries/markdown_inline/highlights.scm
-15
after/queries/markdown_inline/highlights.scm
-1
filetype.lua
-1
filetype.lua
+6
-5
lazy-lock.json
+6
-5
lazy-lock.json
···
1
1
{
2
-
"CopilotChat.nvim": { "branch": "main", "commit": "6db427a0f91d729265ffcbd2cd162d38d97879f2" },
2
+
"CopilotChat.nvim": { "branch": "main", "commit": "f84727fd79f726b7e848adf89108d66805638f06" },
3
3
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
4
4
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
5
5
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
···
8
8
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
9
9
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
10
10
"copilot-cmp": { "branch": "master", "commit": "15fc12af3d0109fa76b60b5cffa1373697e261d1" },
11
-
"copilot.lua": { "branch": "master", "commit": "4a557e74514fd5918e8aabb55b8cfd10535a9a33" },
11
+
"copilot.lua": { "branch": "master", "commit": "d296017e588215df3f7b5796d1172f0d690fa13c" },
12
12
"curl.nvim": { "branch": "main", "commit": "fe07677a2a24bc8793b90fa2c0da626ea6c9e47d" },
13
+
"diffview.nvim": { "branch": "main", "commit": "4516612fe98ff56ae0415a259ff6361a89419b0a" },
13
14
"fidget.nvim": { "branch": "main", "commit": "b61e8af9b8b68ee0ec7da5fb7a8c203aae854f2e" },
14
15
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
15
16
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
16
17
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
17
-
"helpful.vim": { "branch": "master", "commit": "14d675370f1655e408e0cbf1d4d7f3cd7e7dfabe" },
18
+
"helpful.vim": { "branch": "master", "commit": "9e7dea5470c2b8794d076aedd8186fe2e889a88c" },
18
19
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
19
20
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
20
21
"lualine.nvim": { "branch": "master", "commit": "9fef261b53fbe3a2ef01ee9667f6fde064b1ed10" },
21
-
"markview.nvim": { "branch": "main", "commit": "2192327840a4da1b4bd22495e02dbd4f12af9413" },
22
+
"markview.nvim": { "branch": "main", "commit": "556cac8bb8eeb461013ebe0d015e2c48d3527c36" },
22
23
"mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" },
23
24
"mini.bufremove": { "branch": "main", "commit": "285bdac9596ee7375db50c0f76ed04336dcd2685" },
24
25
"mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" },
···
41
42
"org-roam.nvim": { "branch": "main", "commit": "f92b54eff931982031d5e164482d5e781bb2cd31" },
42
43
"orgmode": { "branch": "master", "commit": "dafb6aa6e2e09362e304a933974c563bab0b464f" },
43
44
"plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" },
44
-
"schemastore.nvim": { "branch": "main", "commit": "236438da47cafc39b15d2017a229a6613c581055" },
45
+
"schemastore.nvim": { "branch": "main", "commit": "735e53aa42423239e1f862e3356bdda56a2ba30e" },
45
46
"snacks.nvim": { "branch": "main", "commit": "5eac729fa290248acfe10916d92a5ed5e5c0f9ed" },
46
47
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
47
48
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
+1
-4
lua/core/keymaps.lua
+1
-4
lua/core/keymaps.lua
···
12
12
13
13
-- general
14
14
u.map("n", "<leader>q", "<cmd>quit!<cr>")
15
+
u.map("n", "<leader>Q", "<cmd>tabclose!<cr>")
15
16
u.map("n", "<leader>w", "<cmd>write!<cr>")
16
17
u.map("n", "<C-s>", "<cmd>write!<cr>")
17
18
u.map("i", "jk", "<esc>")
···
20
21
u.map("n", "<C-u>", "<C-u>zz")
21
22
u.map("n", "[b", ":bp<cr>")
22
23
u.map("n", "]b", ":bn<cr>")
23
-
24
-
-- quickfix
25
-
u.map("n", "]q", "<cmd>cnext<cr>")
26
-
u.map("n", "[q", "<cmd>cprev<cr>")
27
24
28
25
-- macros
29
26
u.map("n", "Q", "@qj")
+1
-1
lua/core/lazy.lua
+1
-1
lua/core/lazy.lua
+3
-3
lua/core/options.lua
+3
-3
lua/core/options.lua
···
5
5
signs = {
6
6
text = {
7
7
[vim.diagnostic.severity.ERROR] = "",
8
-
[vim.diagnostic.severity.WARN] = "",
8
+
[vim.diagnostic.severity.WARN] = "",
9
9
[vim.diagnostic.severity.HINT] = "",
10
10
[vim.diagnostic.severity.INFO] = "",
11
11
},
···
41
41
vim.o.splitright = true
42
42
vim.o.pumheight = 8
43
43
vim.o.numberwidth = 4
44
-
vim.o.scrolloff = 8
45
-
vim.o.sidescrolloff = 12
44
+
vim.o.scrolloff = 14
45
+
vim.o.sidescrolloff = 16
46
46
vim.o.signcolumn = "yes"
47
47
vim.o.hidden = true
48
48
vim.o.title = true
+9
-5
lua/plugins/completion.lua
+9
-5
lua/plugins/completion.lua
···
15
15
setup_fn(cmp)
16
16
end
17
17
18
-
cmp.setup.cmdline(":", {
19
-
mapping = cmp.mapping.preset.cmdline(),
20
-
sources = { { name = "path" }, { name = "cmdline" } },
21
-
})
22
-
23
18
cmp.setup(opts)
24
19
end,
25
20
opts = function()
···
34
29
sources = {
35
30
{ name = "hledger" },
36
31
{ name = "buffer" },
32
+
},
33
+
})
34
+
end,
35
+
function(c)
36
+
c.setup.cmdline(":", {
37
+
mapping = c.mapping.preset.cmdline(),
38
+
sources = {
39
+
{ name = "path" },
40
+
{ name = "cmdline" },
37
41
},
38
42
})
39
43
end,
-1
lua/plugins/core.lua
-1
lua/plugins/core.lua
+1
lua/plugins/git.lua
+1
lua/plugins/git.lua
···
83
83
---@module "cmp"
84
84
---@param opts cmp.ConfigSchema
85
85
opts = function(_, opts)
86
+
---@diagnostic disable-next-line:undefined-field
86
87
table.insert(opts.custom_setups, function(cmp)
87
88
cmp.setup.filetype({ "gitcommit", "NeogitCommitMessage" }, {
88
89
sources = { { name = "buffer" }, { name = "luasnip" } },
-6
lua/plugins/gopher.lua
-6
lua/plugins/gopher.lua
···
1
-
local dev_deps = false
2
-
3
1
---@type LazySpec
4
2
return {
5
3
"olexsmir/gopher.nvim",
···
8
6
build = function()
9
7
pcall(vim.cmd.GoInstallDeps)
10
8
end,
11
-
dependencies = {
12
-
{ "williamboman/mason.nvim", cond = dev_deps, config = true },
13
-
},
14
9
---@module "gopher"
15
10
---@type gopher.Config
16
11
---@diagnostic disable-next-line: missing-fields
17
12
opts = {
18
-
use_mason = dev_deps,
19
13
log_level = vim.log.levels.TRACE,
20
14
gotests = {
21
15
template = "testify",
+1
-1
lua/plugins/lsp/attach.lua
+1
-1
lua/plugins/lsp/attach.lua
+12
lua/plugins/mini.lua
+12
lua/plugins/mini.lua
+3
-3
lua/plugins/orgmode.lua
+3
-3
lua/plugins/orgmode.lua
···
107
107
org_todo_keywords = { "TODO(t)", "INB", "DOING(p)" , "|", "DONE(d)", "KILL(k)",},
108
108
org_hide_emphasis_markers = true,
109
109
org_startup_indented = true,
110
-
org_startup_folded = "content", -- "showeverything"
110
+
org_startup_folded = "overview",
111
111
org_ellipsis = "\t\t[···]",
112
112
org_priority_highest = "A",
113
113
org_priority_lowest = "D",
···
131
131
t = {
132
132
description = "Task",
133
133
template = "* TODO %?",
134
-
target = orgpath "todo",
134
+
target = orgpath "personal",
135
135
},
136
136
i = { description = "Inbox", template = "* %?" },
137
137
w = {
···
146
146
types = {
147
147
{
148
148
type = "tags_todo",
149
-
match = "-goals",
149
+
match = "-goals-prj",
150
150
org_agenda_overriding_header = "Personal todos",
151
151
org_agenda_files = { orgpath "todo", orgpath "personal" },
152
152
org_agenda_sorting_strategy = { "priority-down", "todo-state-down" },
-13
lua/plugins/snacks.lua
-13
lua/plugins/snacks.lua
-1
lua/plugins/treesitter.lua
-1
lua/plugins/treesitter.lua
+6
spell/en.utf-8.add
+6
spell/en.utf-8.add