afonso/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

chore(nvim): autopairs bs map and harpoon and tpipeline fix

Browse source
This commit is contained in:
Afonso Franco 2024-05-01 18:52:16 +01:00
parent eb7a612dbc
commit 970179400d
Signed by: afonso
SSH key fingerprint: SHA256:gkVPzsQQJzqi21ntQBV6pXTx4bYI53rFGI4XtvCpwd4
6 changed files with 139 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.config/nvim/lua/plugins/autopairs.lua
View file

@ -3,7 +3,7 @@ local npairs = require('nvim-autopairs')
npairs.setup({
map_cr = true,
map_bs = false,
map_bs = true,
check_ts = true,
enable_check_bracket_line = true,
ignored_next_char = "[%w]"

13
.config/nvim/lua/plugins/harpoon.lua Normal file
View file

@ -0,0 +1,13 @@
local harpoon = require("harpoon")
-- REQUIRED
harpoon:setup()
-- REQUIRED
vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end)
vim.keymap.set("n", "<C-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)

14
.config/nvim/lua/plugins/lazy.lua
View file

@ -29,6 +29,13 @@ lazy.setup({
end,
},
{
"iamcco/markdown-preview.nvim",
cmd = { "MarkdownPreviewToggle", "MarkdownPreview", "MarkdownPreviewStop" },
ft = { "markdown" },
build = function() vim.fn["mkdp#util#install"]() end,
},
{
"ThePrimeagen/harpoon",
branch = "harpoon2",
@ -38,7 +45,12 @@ lazy.setup({
end
},
"vimpostor/vim-tpipeline",
{
"vimpostor/vim-tpipeline",
config = function()
vim.g.tpipeline_restore = 1
end
},
{
"TobinPalmer/pastify.nvim",

7
.config/nvim/lua/plugins/lspconfig.lua
View file

@ -12,7 +12,7 @@ vim.api.nvim_create_autocmd("LspAttach", {
callback = function(ev)
-- Enable completion triggered by <c-x><c-o>
vim.bo[ev.buf].omnifunc = "v:lua.vim.lsp.omnifunc"
vim.opt_local.signcolumn=numbers
vim.opt_local.signcolumn = numbers
local telescope = require("telescope.builtin")
local conform = require("conform")
@ -106,6 +106,11 @@ mason_lspconfig.setup_handlers({
-- rest of your on_attach process.
require("ltex_extra").setup()
end,
settings = {
ltex = {
language = "en-US",
},
},
})
end,
["basedpyright"] = function()

6
.config/nvim/lua/plugins/telescope.lua
View file

@ -13,10 +13,10 @@ telescope.setup {
pickers = {
find_files = {
previewer = false,
layout_strategy = "vertical",
layout_config = {
layout_strategy = "center",
layout_config = {
height = 0.7,
width = 0.5
width = 0.5
},
},
live_grep = {

103
.config/nvim/queries/go/injections.scm Normal file
View file

@ -0,0 +1,103 @@
; extends
; inject sql in single line strings
; e.g. db.GetContext(ctx, "SELECT * FROM users WHERE name = 'John'")
((call_expression
(selector_expression
field: (field_identifier) @_field)
(argument_list
(interpreted_string_literal) @sql))
(#any-of? @_field "Exec" "GetContext" "ExecContext" "SelectContext" "In"
"RebindNamed" "Rebind" "Query" "QueryRow" "QueryRowxContext" "NamedExec" "MustExec" "Get" "Queryx")
(#offset! @sql 0 1 0 -1))
; still buggy for nvim 0.10
((call_expression
(selector_expression
field: (field_identifier) @_field (#any-of? @_field "Exec" "GetContext" "ExecContext" "SelectContext" "In" "RebindNamed" "Rebind" "Query" "QueryRow" "QueryRowxContext" "NamedExec" "MustExec" "Get" "Queryx"))
(argument_list
(interpreted_string_literal) @injection.content))
(#offset! @injection.content 0 1 0 -1)
(#set! injection.language "sql"))
; neovim nightly 0.10
([
(interpreted_string_literal)
(raw_string_literal)
] @injection.content
(#match? @injection.content "(SELECT|select|INSERT|insert|UPDATE|update|DELETE|delete).+(FROM|from|INTO|into|VALUES|values|SET|set).*(WHERE|where|GROUP BY|group by)?")
(#set! injection.language "sql"))
; a general query injection
([
(interpreted_string_literal)
(raw_string_literal)
] @sql
(#match? @sql "(SELECT|select|INSERT|insert|UPDATE|update|DELETE|delete).+(FROM|from|INTO|into|VALUES|values|SET|set).*(WHERE|where|GROUP BY|group by)?")
(#offset! @sql 0 1 0 -1))
; ----------------------------------------------------------------
; fallback keyword and comment based injection
([
(interpreted_string_literal)
(raw_string_literal)
] @sql
(#contains? @sql "-- sql" "--sql" "ADD CONSTRAINT" "ALTER TABLE" "ALTER COLUMN"
"DATABASE" "FOREIGN KEY" "GROUP BY" "HAVING" "CREATE INDEX" "INSERT INTO"
"NOT NULL" "PRIMARY KEY" "UPDATE SET" "TRUNCATE TABLE" "LEFT JOIN" "add constraint" "alter table" "alter column" "database" "foreign key" "group by" "having" "create index" "insert into"
"not null" "primary key" "update set" "truncate table" "left join")
(#offset! @sql 0 1 0 -1))
; nvim 0.10
([
(interpreted_string_literal)
(raw_string_literal)
] @injection.content
(#contains? @injection.content "-- sql" "--sql" "ADD CONSTRAINT" "ALTER TABLE" "ALTER COLUMN"
"DATABASE" "FOREIGN KEY" "GROUP BY" "HAVING" "CREATE INDEX" "INSERT INTO"
"NOT NULL" "PRIMARY KEY" "UPDATE SET" "TRUNCATE TABLE" "LEFT JOIN" "add constraint" "alter table" "alter column" "database" "foreign key" "group by" "having" "create index" "insert into"
"not null" "primary key" "update set" "truncate table" "left join")
(#offset! @injection.content 0 1 0 -1)
(#set! injection.language "sql"))
; should I use a more exhaustive list of keywords?
; "ADD" "ADD CONSTRAINT" "ALL" "ALTER" "AND" "ASC" "COLUMN" "CONSTRAINT" "CREATE" "DATABASE" "DELETE" "DESC" "DISTINCT" "DROP" "EXISTS" "FOREIGN KEY" "FROM" "JOIN" "GROUP BY" "HAVING" "IN" "INDEX" "INSERT INTO" "LIKE" "LIMIT" "NOT" "NOT NULL" "OR" "ORDER BY" "PRIMARY KEY" "SELECT" "SET" "TABLE" "TRUNCATE TABLE" "UNION" "UNIQUE" "UPDATE" "VALUES" "WHERE"
; json
((const_spec
name: (identifier) @_const
value: (expression_list (raw_string_literal) @json))
(#lua-match? @_const ".*[J|j]son.*"))
; jsonStr := `{"foo": "bar"}`
((short_var_declaration
left: (expression_list
(identifier) @_var)
right: (expression_list
(raw_string_literal) @json))
(#lua-match? @_var ".*[J|j]son.*")
(#offset! @json 0 1 0 -1))
; nvim 0.10
(const_spec
name: ((identifier) @_const(#lua-match? @_const ".*[J|j]son.*"))
value: (expression_list (raw_string_literal) @injection.content
(#set! injection.language "json")))
(short_var_declaration
left: (expression_list (identifier) @_var (#lua-match? @_var ".*[J|j]son.*"))
right: (expression_list (raw_string_literal) @injection.content)
(#offset! @injection.content 0 1 0 -1)
(#set! injection.language "json"))
(var_spec
name: ((identifier) @_const(#lua-match? @_const ".*[J|j]son.*"))
value: (expression_list (raw_string_literal) @injection.content
(#set! injection.language "json")))