Compare commits
2 Commits
66fd13ec25
...
e1d5f7d9ae
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e1d5f7d9ae | ||
|
|
09900d1ebf |
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
|
"LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "d534f9e8bf39299c480e0c2e11dad21f51cfb2fe" },
|
"blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
|
"dressing.nvim": { "branch": "master", "commit": "3a45525bb182730fe462325c99395529308f431e" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
|
"fidget.nvim": { "branch": "main", "commit": "9238947645ce17d96f30842e61ba81147185b657" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
|
||||||
@@ -12,29 +12,29 @@
|
|||||||
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
|
"lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
|
"lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "2daa8921b7afdcfa47419a21ea343c3df6d74fa0" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
||||||
"mini.pairs": { "branch": "main", "commit": "e543c760edc5e746e5b6cbd02c066c17ead3ef16" },
|
"mini.surround": { "branch": "main", "commit": "0e67c4bc147f2a15cee94e7c94dcc0e115b9f55e" },
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "caf85560cfcfa62ad3a4c15433db4a8f9ddf934a" },
|
"none-ls.nvim": { "branch": "main", "commit": "40dc2e983560acaea29d6312b33fafba37b0c272" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
|
"nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
|
||||||
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
|
"nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
|
||||||
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
|
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" },
|
"nvim-treesitter": { "branch": "master", "commit": "50947387c20ec3fb8c30b8c1c1a1c39f68deb970" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef" },
|
"nvim-ufo": { "branch": "main", "commit": "270ca542dae992ffe40274718c63645217ebc8bf" },
|
||||||
"nvim-ufo": { "branch": "main", "commit": "32cb247b893a384f1888b9cd737264159ecf183c" },
|
"nvim-web-devicons": { "branch": "master", "commit": "15c7d0f616ebf88960ce5c4221828f62789d36d9" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "5740b7382429d20b6ed0bbdb0694185af9507d44" },
|
|
||||||
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
|
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
|
"oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" },
|
||||||
"plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
||||||
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
||||||
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
|
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
|
||||||
"statuscol.nvim": { "branch": "main", "commit": "81d1cfb47e91780f72a8d9a3529f146731864313" },
|
"statuscol.nvim": { "branch": "main", "commit": "8822f76e105549620ef9c0d96e7b95aedf14c490" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "dae2eac9d91464448b584c7949a31df8faefec56" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
|
"telescope.nvim": { "branch": "master", "commit": "2eca9ba22002184ac05eddbe47a7fe2d5a384dfc" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
|
"trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
|
||||||
"undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" },
|
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
|
||||||
"vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" },
|
"vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" },
|
||||||
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }
|
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -49,11 +49,3 @@ autocmd({ 'BufWritePre' }, {
|
|||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
|
|
||||||
autocmd({'FileType'}, {
|
|
||||||
group = CrentistGroup,
|
|
||||||
pattern = { 'json' },
|
|
||||||
callback = function (e)
|
|
||||||
vim.keymap.set("n", "<M-F>", function() vim.cmd('silent %!jq .') end, {buffer = e.buf})
|
|
||||||
end
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ return {
|
|||||||
|
|
||||||
opts = {
|
opts = {
|
||||||
snippets = {
|
snippets = {
|
||||||
preset = 'luasnip',
|
|
||||||
expand = function(snippet) require('luasnip').lsp_expand(snippet) end,
|
expand = function(snippet) require('luasnip').lsp_expand(snippet) end,
|
||||||
active = function(filter)
|
active = function(filter)
|
||||||
if filter and filter.direction then
|
if filter and filter.direction then
|
||||||
@@ -21,7 +20,7 @@ return {
|
|||||||
jump = function(direction) require('luasnip').jump(direction) end,
|
jump = function(direction) require('luasnip').jump(direction) end,
|
||||||
},
|
},
|
||||||
|
|
||||||
completion = { list = { selection = { preselect = false, auto_insert = true } } },
|
completion = { list = { selection = "auto_insert" } },
|
||||||
keymap = {
|
keymap = {
|
||||||
preset = 'enter',
|
preset = 'enter',
|
||||||
['<Tab>'] = { 'select_next', 'snippet_forward', 'fallback' },
|
['<Tab>'] = { 'select_next', 'snippet_forward', 'fallback' },
|
||||||
@@ -33,12 +32,9 @@ return {
|
|||||||
nerd_font_variant = 'mono'
|
nerd_font_variant = 'mono'
|
||||||
},
|
},
|
||||||
|
|
||||||
cmdline = {
|
|
||||||
sources = {},
|
|
||||||
},
|
|
||||||
|
|
||||||
sources = {
|
sources = {
|
||||||
default = { 'lsp', 'snippets', 'path', 'buffer' },
|
default = { 'lsp', 'luasnip', 'path', 'buffer' },
|
||||||
|
cmdline = {},
|
||||||
},
|
},
|
||||||
|
|
||||||
signature = { enabled = true }
|
signature = { enabled = true }
|
||||||
|
|||||||
@@ -60,12 +60,6 @@ return {
|
|||||||
settings = {
|
settings = {
|
||||||
pylsp = {
|
pylsp = {
|
||||||
plugins = {
|
plugins = {
|
||||||
autopep8 = {
|
|
||||||
enabled = false,
|
|
||||||
},
|
|
||||||
yapf = {
|
|
||||||
enabled = true,
|
|
||||||
},
|
|
||||||
pycodestyle = {
|
pycodestyle = {
|
||||||
ignore = { 'W391' },
|
ignore = { 'W391' },
|
||||||
maxLineLength = pythonLineLength
|
maxLineLength = pythonLineLength
|
||||||
@@ -88,17 +82,7 @@ return {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lspconfig.yamlls.setup {}
|
lspconfig.yamlls.setup { }
|
||||||
lspconfig.helm_ls.setup {
|
|
||||||
settingsa = {
|
|
||||||
['helm-ls'] = {
|
|
||||||
yamlls = {
|
|
||||||
enabled = false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
lspconfig.terraformls.setup {
|
lspconfig.terraformls.setup {
|
||||||
filetypes = { 'terraform', 'terraform-vars', 'tf' }
|
filetypes = { 'terraform', 'terraform-vars', 'tf' }
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
return {
|
|
||||||
'echasnovski/mini.pairs',
|
|
||||||
version = '*',
|
|
||||||
config = function()
|
|
||||||
require('mini.pairs').setup()
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
8
lua/crentist/lazy/mini.lua
Normal file
8
lua/crentist/lazy/mini.lua
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
return {
|
||||||
|
'echasnovski/mini.surround',
|
||||||
|
version = '*',
|
||||||
|
config = function ()
|
||||||
|
require('mini.surround').setup()
|
||||||
|
end
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
return {
|
return {
|
||||||
'lucidph3nx/nvim-sops',
|
'lucidph3nx/nvim-sops',
|
||||||
event = { 'BufEnter' },
|
event = { 'BufEnter' },
|
||||||
opts = { },
|
opts = {
|
||||||
|
-- your configuration comes here
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
},
|
||||||
keys = {
|
keys = {
|
||||||
{ '<leader>ef', vim.cmd.SopsEncrypt, desc = '[E]ncrypt [F]ile' },
|
{ '<leader>ef', vim.cmd.SopsEncrypt, desc = '[E]ncrypt [F]ile' },
|
||||||
{ '<leader>df', vim.cmd.SopsDecrypt, desc = '[D]ecrypt [F]ile' },
|
{ '<leader>df', vim.cmd.SopsDecrypt, desc = '[D]ecrypt [F]ile' },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,9 +0,0 @@
|
|||||||
return {
|
|
||||||
"kylechui/nvim-surround",
|
|
||||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
|
||||||
event = "VeryLazy",
|
|
||||||
config = function()
|
|
||||||
require("nvim-surround").setup({})
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -108,21 +108,3 @@ ls.add_snippets('terraform', {
|
|||||||
),
|
),
|
||||||
})
|
})
|
||||||
|
|
||||||
------------------------------
|
|
||||||
-- YAML
|
|
||||||
------------------------------
|
|
||||||
local yaml_schema_snippet = s(
|
|
||||||
{ name = 'yaml_schema', trig = 'yaml_schema' },
|
|
||||||
fmt([[
|
|
||||||
{comment} yaml-language-server: $schema={path}
|
|
||||||
]],
|
|
||||||
{
|
|
||||||
path = i(1, 'path'),
|
|
||||||
comment = f(com_string, {}, { user_args = { false } }),
|
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
ls.add_snippets('yaml', { yaml_schema_snippet })
|
|
||||||
ls.add_snippets('helm', { yaml_schema_snippet })
|
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,8 @@ vim.keymap.set("n", "<leader>pv", ":Oil<CR>")
|
|||||||
vim.keymap.set("n", "<C-d>", "<C-d>zz")
|
vim.keymap.set("n", "<C-d>", "<C-d>zz")
|
||||||
vim.keymap.set("n", "<C-u>", "<C-u>zz")
|
vim.keymap.set("n", "<C-u>", "<C-u>zz")
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>bc", ":bp|bd!#<CR>")
|
||||||
|
|
||||||
-- move selected blocks
|
-- move selected blocks
|
||||||
vim.keymap.set("v", "<S-J>", ":m '>+1<CR>gv=gv")
|
vim.keymap.set("v", "<S-J>", ":m '>+1<CR>gv=gv")
|
||||||
vim.keymap.set("v", "<S-K>", ":m '<-2<CR>gv=gv")
|
vim.keymap.set("v", "<S-K>", ":m '<-2<CR>gv=gv")
|
||||||
|
|||||||
Reference in New Issue
Block a user