punkfairie/marleyvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Proper injection queries

Browse source
This commit is contained in:
punkfairie 2024-11-26 20:50:32 -08:00
parent e3ef9e4716
commit 8efea03163
Signed by: punkfairie
GPG key ID: A509E8F77FB9D696
3 changed files with 104 additions and 124 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

154
modules/nixvim/autocommands/default.nix
View file

@ -23,51 +23,43 @@ in {
]; ];
autoCmd = [ autoCmd = [
(autocmds.mk' ["FocusGained" "TermClose" "TermLeave"] "checktime" (mkRaw (autocmds.mk' ["FocusGained" "TermClose" "TermLeave"] "checktime" (mkRaw ''
# lua function()
'' if vim.o.buftype ~= "nofile" then
function() vim.cmd("checktime")
if vim.o.buftype ~= "nofile" then
vim.cmd("checktime")
end
end end
'') "Check if file needs to be reloaded when changed") end
'') "Check if file needs to be reloaded when changed")
(autocmds.mk' ["TextYankPost"] "highlight_yank" (mkRaw (autocmds.mk' ["TextYankPost"] "highlight_yank" (mkRaw ''
# lua function()
'' (vim.hl or vim.highlight).on_yank()
function() end
(vim.hl or vim.highlight).on_yank() '') "Highlight on yank")
end
'') "Highlight on yank")
(autocmds.mk' ["VimResized"] "resize_splits" (mkRaw (autocmds.mk' ["VimResized"] "resize_splits" (mkRaw ''
# lua function()
'' local current_tab = vim.fn.tabpagenr()
function() vim.cmd("tabdo wincmd =")
local current_tab = vim.fn.tabpagenr() vim.cmd("tabnext " .. current_tab)
vim.cmd("tabdo wincmd =") end
vim.cmd("tabnext " .. current_tab) '') "Resize splits on window resize")
end
'') "Resize splits on window resize")
(autocmds.mk' ["BufReadPost"] "last_loc" (mkRaw (autocmds.mk' ["BufReadPost"] "last_loc" (mkRaw ''
# lua function(event)
'' local exclude = { "gitcommit" }
function(event) local buf = event.buf
local exclude = { "gitcommit" } if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].marleyvim_last_loc then
local buf = event.buf return
if vim.tbl_contains(exclude, vim.bo[buf].filetype) or vim.b[buf].marleyvim_last_loc then
return
end
vim.b[buf].marleyvim_last_loc = true
local mark = vim.api.nvim_buf_get_mark(buf, '"')
local lcount = vim.api.nvim_buf_line_count(buf)
if mark[1] > 0 and mark[1] <= lcount then
pcall(vim.api.nvim_win_set_cursor, 0, mark)
end
end end
'') "Go to last location when opening a buffer") vim.b[buf].marleyvim_last_loc = true
local mark = vim.api.nvim_buf_get_mark(buf, '"')
local lcount = vim.api.nvim_buf_line_count(buf)
if mark[1] > 0 and mark[1] <= lcount then
pcall(vim.api.nvim_win_set_cursor, 0, mark)
end
end
'') "Go to last location when opening a buffer")
(autocmds.mk ["FileType"] "close_with_q" [ (autocmds.mk ["FileType"] "close_with_q" [
"PlenaryTestPopup" "PlenaryTestPopup"
@ -86,31 +78,27 @@ in {
"spectre_panel" "spectre_panel"
"startuptime" "startuptime"
"tsplayground" "tsplayground"
] (mkRaw ] (mkRaw ''
# lua
''
function(event)
vim.bo[event.buf].buflisted = false
vim.schedule(function()
vim.keymap.set("n", "q", function()
vim.cmd("close")
pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
end, {
buffer = event.buf,
silent = true,
desc = "Quit buffer",
})
end)
end
'') "Close some filetypes with <q>")
(autocmds.mk ["FileType"] "man_unlisted" ["man"] (mkRaw
# lua
''
function(event) function(event)
vim.bo[event.buf].buflisted = false vim.bo[event.buf].buflisted = false
vim.schedule(function()
vim.keymap.set("n", "q", function()
vim.cmd("close")
pcall(vim.api.nvim_buf_delete, event.buf, { force = true })
end, {
buffer = event.buf,
silent = true,
desc = "Quit buffer",
})
end)
end end
'') "Easy-close man files") '') "Close some filetypes with <q>")
(autocmds.mk ["FileType"] "man_unlisted" ["man"] (mkRaw ''
function(event)
vim.bo[event.buf].buflisted = false
end
'') "Easy-close man files")
(autocmds.mk ["FileType"] "wrap_spell" [ (autocmds.mk ["FileType"] "wrap_spell" [
"text" "text"
@ -118,33 +106,27 @@ in {
"typst" "typst"
"gitcommit" "gitcommit"
"markdown" "markdown"
] (mkRaw ] (mkRaw ''
# lua
''
function()
vim.opt_local.wrap = true
vim.opt_local.spell = true
end
'') "Wrap & check spelling in text files")
(autocmds.mk ["FileType"] "json_conceal" ["json" "jsonc" "json5"] (mkRaw
# lua
''
function() function()
vim.opt_local.conceallevel = 0 vim.opt_local.wrap = true
vim.opt_local.spell = true
end end
'') "Fix conceallevel for json files") '') "Wrap & check spelling in text files")
(autocmds.mk' ["BufWritePre"] "auto_create_dir" (mkRaw (autocmds.mk ["FileType"] "json_conceal" ["json" "jsonc" "json5"] (mkRaw ''
# lua function()
'' vim.opt_local.conceallevel = 0
function(event) end
if event.match:match("^%w%w+:[\\/][\\/]") then '') "Fix conceallevel for json files")
return
end (autocmds.mk' ["BufWritePre"] "auto_create_dir" (mkRaw ''
local file = vim.uv.fs_realpath(event.match) or event.match function(event)
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p") if event.match:match("^%w%w+:[\\/][\\/]") then
return
end end
'') "Auto create missing parent dirs when saving") local file = vim.uv.fs_realpath(event.match) or event.match
vim.fn.mkdir(vim.fn.fnamemodify(file, ":p:h"), "p")
end
'') "Auto create missing parent dirs when saving")
]; ];
} }

18
modules/nixvim/keymaps/default.nix
View file

@ -165,9 +165,9 @@ in {
# Diagnostics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Diagnostics - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
++ [ ++ [
(keys.mk ["n"] "<LEADER>cd" ( (keys.mk ["n"] "<LEADER>cd" (
mkRaw mkRaw ''
# lua function() vim.diagnostic.open_float() end
"function() vim.diagnostic.open_float() end" ''
) "Line Diagnostics") ) "Line Diagnostics")
] ]
++ ( ++ (
@ -200,13 +200,11 @@ in {
cmd = toLower dir; cmd = toLower dir;
sev = sevs."${key}".key; sev = sevs."${key}".key;
in in
keys.mk ["n"] kmap keys.mk ["n"] kmap (
( mkRaw ''
mkRaw function() vim.diagnostic.goto_${cmd}({ severity = ${sev} }) end
# lua ''
"function() vim.diagnostic.goto_${cmd}({ severity = ${sev} }) end" ) "${dir} ${sevs."${key}".desc}"
)
"${dir} ${sevs."${key}".desc}"
) )
{ {
dir = ["Next" "Prev"]; dir = ["Next" "Prev"];

56
modules/nixvim/plugins/util/snacks/default.nix
View file

@ -23,62 +23,62 @@ in {
keymaps = [ keymaps = [
(keys.mk ["n"] "<LEADER>un" ( (keys.mk ["n"] "<LEADER>un" (
mkRaw mkRaw ''
# lua function() Snacks.notifier.hide() end
"function() Snacks.notifier.hide() end" ''
) "Dismiss All Notifications") ) "Dismiss All Notifications")
(keys.mk ["n"] "<LEADER>bd" ( (keys.mk ["n"] "<LEADER>bd" (
mkRaw mkRaw ''
# lua function() Snacks.bufdelete() end
"function() Snacks.bufdelete() end" ''
) "Delete Buffer") ) "Delete Buffer")
(keys.mk ["n"] "<LEADER>bo" ( (keys.mk ["n"] "<LEADER>bo" (
mkRaw mkRaw ''
# lua function() Snacks.bufdelete.other() end
"function() Snacks.bufdelete.other() end" ''
) "Delete Other Buffers") ) "Delete Other Buffers")
# LazyGit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # LazyGit - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
(keys.mk ["n"] "<LEADER>gg" ( (keys.mk ["n"] "<LEADER>gg" (
mkRaw mkRaw ''
# lua function() Snacks.lazygit() end
"function() Snacks.lazygit() end" ''
) "Lazygit") ) "Lazygit")
(keys.mk ["n"] "<LEADER>gf" ( (keys.mk ["n"] "<LEADER>gf" (
mkRaw mkRaw ''
# lua function() Snacks.lazygit.log_file() end
"function() Snacks.lazygit.log_file() end" ''
) "Lazygit Current File History") ) "Lazygit Current File History")
(keys.mk ["n"] "<LEADER>gl" ( (keys.mk ["n"] "<LEADER>gl" (
mkRaw mkRaw ''
# lua function() Snacks.lazygit.log() end
"function() Snacks.lazygit.log() end" ''
) "Lazygit Log") ) "Lazygit Log")
# Git - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Git - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
(keys.mk ["n"] "<LEADER>gb" ( (keys.mk ["n"] "<LEADER>gb" (
mkRaw mkRaw ''
# lua function() Snacks.git.blame_line() end
"function() Snacks.git.blame_line() end" ''
) "Git Blame Line") ) "Git Blame Line")
(keys.mk ["n" "x"] "<LEADER>gB" ( (keys.mk ["n" "x"] "<LEADER>gB" (
mkRaw mkRaw ''
# lua function() Snacks.gitbrowse() end
"function() Snacks.gitbrowse() end" ''
) "Git Browse (open)") ) "Git Browse (open)")
(keys.mk ["n" "x"] "<LEADER>gY" (mkRaw (keys.mk ["n" "x"] "<LEADER>gY" (
# lua mkRaw ''
''
function() function()
Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end }) Snacks.gitbrowse({ open = function(url) vim.fn.setreg("+", url) end })
end end
'') "Git Browse (copy)") ''
) "Git Browse (copy)")
]; ];
# Toggles - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Toggles - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -