Compare commits
27 Commits
a947bcda9b
...
feature/de
| Author | SHA1 | Date | |
|---|---|---|---|
| 31c93a8fe5 | |||
| aede270a03 | |||
| ae6d8b81e3 | |||
| 72e01ce321 | |||
| 08583ff839 | |||
| 09a7cda545 | |||
| 4f00972dec | |||
| 7e3b1dd83e | |||
| 9951270d0b | |||
| f19091b3ec | |||
| 350beee4f1 | |||
| a2c7c46185 | |||
| c0545fd267 | |||
| cfec54bead | |||
| 952d016f70 | |||
| 53339e0d19 | |||
| 8b114f4da0 | |||
| 66fd13ec25 | |||
| f7ff3f6f4f | |||
| 78d14b79a7 | |||
| 0f0dafb773 | |||
| b6471168fb | |||
| 8bf693ba29 | |||
| b1ecff2e08 | |||
| 8894b0ccdb | |||
| 132e1aa78a | |||
| b92b8ed602 |
@@ -1,48 +1,43 @@
|
|||||||
{
|
{
|
||||||
"LuaSnip": { "branch": "master", "commit": "0f7bbce41ea152a94d12aea286f2ce98e63c0f58" },
|
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
||||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
"blink-ripgrep.nvim": { "branch": "main", "commit": "12fb7348cf9d32a0ed2e3ab4960d561632e57ba4" },
|
||||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
|
||||||
"cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" },
|
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||||
"cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
|
"fzf-lua": { "branch": "main", "commit": "c53ba4f40f0514a5038646fb1e9ce05872b18eb1" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "fc78a3ca96f4db9f8893bb7e2fd9823e0780451b" },
|
"gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "e2a175c2abe2d4f65357da1c98c59a5cfb2b543f" },
|
"gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "de8fce94985873666bd9712ea3e49ee17aadb1ed" },
|
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "ac5aba6dce8c06ea22bea2c9016f51a2dbf90dc7" },
|
"hererocks": { "branch": "master", "commit": "4ce92131e9858950440ab99a25db9a9b43db8cd4" },
|
||||||
"gruvbox.nvim": { "branch": "main", "commit": "49d9c0b150ba70efcd831ec7b3cb8ee740067045" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||||
"harpoon": { "branch": "harpoon2", "commit": "a84ab829eaf3678b586609888ef52f7779102263" },
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
"hererocks": { "branch": "master", "commit": "c9c5444dea1e07e005484014a8231aa667be30b6" },
|
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||||
"icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
|
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "7871a88056f7144defca9c931e311a3134c5d509" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "f54e3c11fc9ebfcfc27e696182b0295b071d0811" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "7967abe55752aa90532e6bb4bd4663fe27a264cb" },
|
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "f59bd14a852ca43db38e3662395354cb2a9b13e0" },
|
"mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
|
"none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "43894adcf10bb1190c2184bd7c1750e8ea2b3dce" },
|
|
||||||
"mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
|
|
||||||
"neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
|
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "b7cf202083b18bc9319e4c8ad5341a3d09241192" },
|
|
||||||
"nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
|
|
||||||
"nvim-cmp": { "branch": "main", "commit": "f17d9b4394027ff4442b298398dfcaab97e40c4f" },
|
|
||||||
"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": "f887d794a0f4594882814d7780980a949200a238" },
|
||||||
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
|
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
|
"nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "37427012d1c77c544356bfff0c9acc88fd3256bc" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
"nvim-ufo": { "branch": "main", "commit": "c070ee849bfedb2ed778f60419a1eae8c8544be8" },
|
"nvim-ufo": { "branch": "main", "commit": "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "e87554285f581047b1bf236794b0eb812b444b87" },
|
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||||
"obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" },
|
"obsidian.nvim": { "branch": "main", "commit": "2f0222b3eb20382cadf3e1d91f368318b768771c" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "8ea40b5506115b6d355e304dd9ee5089f7d78601" },
|
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
|
||||||
"plenary": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"parrot.nvim": { "branch": "main", "commit": "0477748832812707e53db078d0180299a0c15d6c" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
|
"plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
"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": "8822f76e105549620ef9c0d96e7b95aedf14c490" },
|
"statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "85922dde3767e01d42a08e750a773effbffaea3e" },
|
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "3dc00c0447c016cd43e03054c3d49436a1f2076d" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
"undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
|
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
|
||||||
"vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
|
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||||
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }
|
"vim-helm": { "branch": "master", "commit": "cc5ac22444332381f38084a6c7f023c25eef6201" }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,3 +49,11 @@ 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
|
||||||
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +0,0 @@
|
|||||||
return {
|
|
||||||
'windwp/nvim-autopairs',
|
|
||||||
event = "InsertEnter",
|
|
||||||
config = true
|
|
||||||
}
|
|
||||||
85
lua/crentist/lazy/completion.lua
Normal file
85
lua/crentist/lazy/completion.lua
Normal file
@@ -0,0 +1,85 @@
|
|||||||
|
return {
|
||||||
|
'saghen/blink.cmp',
|
||||||
|
-- optional: provides snippets for the snippet source
|
||||||
|
dependencies = {
|
||||||
|
'mikavilpas/blink-ripgrep.nvim',
|
||||||
|
'rafamadriz/friendly-snippets',
|
||||||
|
{ 'L3MON4D3/LuaSnip', version = 'v2.*' }
|
||||||
|
},
|
||||||
|
-- use a release tag to download pre-built binaries
|
||||||
|
version = 'v1.4.*',
|
||||||
|
|
||||||
|
opts = {
|
||||||
|
fuzzy = { implementation = 'prefer_rust_with_warning' },
|
||||||
|
|
||||||
|
snippets = {
|
||||||
|
preset = 'luasnip',
|
||||||
|
},
|
||||||
|
|
||||||
|
cmdline = {
|
||||||
|
keymap = { preset = 'cmdline' },
|
||||||
|
completion = {
|
||||||
|
list = { selection = { preselect = false, auto_insert = true } }
|
||||||
|
}
|
||||||
|
},
|
||||||
|
completion = { list = { selection = { preselect = false, auto_insert = true } } },
|
||||||
|
keymap = {
|
||||||
|
preset = 'enter',
|
||||||
|
['<Tab>'] = { 'select_next', 'snippet_forward', 'fallback' },
|
||||||
|
['<S-Tab>'] = { 'select_prev', 'snippet_backward', 'fallback' },
|
||||||
|
},
|
||||||
|
|
||||||
|
appearance = {
|
||||||
|
use_nvim_cmp_as_default = true,
|
||||||
|
nerd_font_variant = 'mono'
|
||||||
|
},
|
||||||
|
|
||||||
|
sources = {
|
||||||
|
default = { 'lazydev', 'lsp', 'snippets', 'ripgrep', 'path', 'buffer' },
|
||||||
|
providers = {
|
||||||
|
lazydev = {
|
||||||
|
name = 'LazyDev',
|
||||||
|
module = 'lazydev.integrations.blink',
|
||||||
|
-- make lazydev completions top priority (see `:h blink.cmp`)
|
||||||
|
score_offset = 100,
|
||||||
|
},
|
||||||
|
ripgrep = {
|
||||||
|
module = 'blink-ripgrep',
|
||||||
|
name = 'Ripgrep',
|
||||||
|
score_offset = -2,
|
||||||
|
-- the options below are optional, some default values are shown
|
||||||
|
---@module 'blink-ripgrep'
|
||||||
|
---@type blink-ripgrep.Options
|
||||||
|
opts = {
|
||||||
|
max_filesize = '1M',
|
||||||
|
project_root_marker = '.git',
|
||||||
|
project_root_fallback = true,
|
||||||
|
search_casing = '--ignore-case',
|
||||||
|
additional_rg_options = {},
|
||||||
|
fallback_to_regex_highlighting = true,
|
||||||
|
ignore_paths = {},
|
||||||
|
additional_paths = {},
|
||||||
|
future_features = {
|
||||||
|
backend = {
|
||||||
|
use = 'ripgrep',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
debug = false,
|
||||||
|
},
|
||||||
|
transform_items = function(_, items)
|
||||||
|
for _, item in ipairs(items) do
|
||||||
|
-- example: append a description to easily distinguish rg results
|
||||||
|
item.labelDetails = {
|
||||||
|
description = '(rg)',
|
||||||
|
}
|
||||||
|
end
|
||||||
|
return items
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
|
signature = { enabled = true }
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
9
lua/crentist/lazy/decrypt.lua
Normal file
9
lua/crentist/lazy/decrypt.lua
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
return {}
|
||||||
|
-- return {
|
||||||
|
-- { dir = "~/.dotfiles/nvim-plugins/decrypt.nvim" },
|
||||||
|
-- -- config = function()
|
||||||
|
-- -- require "decrypt"
|
||||||
|
-- -- end
|
||||||
|
-- }
|
||||||
|
--
|
||||||
|
|
||||||
@@ -1,13 +0,0 @@
|
|||||||
return {
|
|
||||||
"ziontee113/icon-picker.nvim",
|
|
||||||
config = function()
|
|
||||||
require("icon-picker").setup({ disable_legacy_commands = true })
|
|
||||||
|
|
||||||
local opts = { noremap = true, silent = true }
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<Leader><Leader>i", "<cmd>IconPickerNormal<cr>", opts)
|
|
||||||
vim.keymap.set("n", "<Leader><Leader>y", "<cmd>IconPickerYank<cr>", opts) --> Yank the selected icon into register
|
|
||||||
vim.keymap.set("i", "<C-i>", "<cmd>IconPickerInsert<cr>", opts)
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -4,13 +4,7 @@ return {
|
|||||||
dependencies = {
|
dependencies = {
|
||||||
'williamboman/mason.nvim',
|
'williamboman/mason.nvim',
|
||||||
'williamboman/mason-lspconfig.nvim',
|
'williamboman/mason-lspconfig.nvim',
|
||||||
'hrsh7th/nvim-cmp',
|
'saghen/blink.cmp',
|
||||||
'hrsh7th/cmp-nvim-lsp',
|
|
||||||
'hrsh7th/cmp-buffer',
|
|
||||||
'hrsh7th/cmp-path',
|
|
||||||
'SergioRibera/cmp-dotenv',
|
|
||||||
'hrsh7th/cmp-cmdline',
|
|
||||||
'saadparwaiz1/cmp_luasnip',
|
|
||||||
'L3MON4D3/LuaSnip',
|
'L3MON4D3/LuaSnip',
|
||||||
'j-hui/fidget.nvim',
|
'j-hui/fidget.nvim',
|
||||||
'rafamadriz/friendly-snippets',
|
'rafamadriz/friendly-snippets',
|
||||||
@@ -29,10 +23,9 @@ return {
|
|||||||
},
|
},
|
||||||
|
|
||||||
config = function()
|
config = function()
|
||||||
local lspconfig = require('lspconfig')
|
vim.diagnostic.config({ virtual_text = false })
|
||||||
|
|
||||||
local cmp = require('cmp')
|
local lspconfig = require('lspconfig')
|
||||||
local luasnip = require('luasnip')
|
|
||||||
|
|
||||||
-- load snippets from friendly-snippets
|
-- load snippets from friendly-snippets
|
||||||
require('luasnip.loaders.from_vscode').lazy_load()
|
require('luasnip.loaders.from_vscode').lazy_load()
|
||||||
@@ -40,6 +33,7 @@ return {
|
|||||||
require('fidget').setup({})
|
require('fidget').setup({})
|
||||||
require('mason').setup({})
|
require('mason').setup({})
|
||||||
require('mason-lspconfig').setup({
|
require('mason-lspconfig').setup({
|
||||||
|
automatic_installation = false,
|
||||||
-- Replace the language servers listed here
|
-- Replace the language servers listed here
|
||||||
-- with the ones you want to install
|
-- with the ones you want to install
|
||||||
ensure_installed = {
|
ensure_installed = {
|
||||||
@@ -56,74 +50,25 @@ return {
|
|||||||
},
|
},
|
||||||
handlers = {
|
handlers = {
|
||||||
function(server_name)
|
function(server_name)
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||||
require('lspconfig')[server_name].setup({
|
require('lspconfig')[server_name].setup({
|
||||||
capabilities = capabilities
|
capabilities = capabilities
|
||||||
})
|
})
|
||||||
end,
|
end,
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
cmp.setup({
|
|
||||||
sources = {
|
|
||||||
{ name = 'path' },
|
|
||||||
{ name = 'nvim_lsp' },
|
|
||||||
{ name = 'luasnip', keyword_length = 2 },
|
|
||||||
{ name = 'buffer', keyword_length = 3 },
|
|
||||||
},
|
|
||||||
mapping = cmp.mapping.preset.insert({
|
|
||||||
-- `Enter` key to confirm completion
|
|
||||||
['<CR>'] = cmp.mapping({
|
|
||||||
i = function(fallback)
|
|
||||||
if cmp.visible() and cmp.get_active_entry() then
|
|
||||||
cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
s = cmp.mapping.confirm({ select = true }),
|
|
||||||
c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
|
|
||||||
}),
|
|
||||||
['<Tab>'] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_next_item()
|
|
||||||
elseif luasnip.locally_jumpable(1) then
|
|
||||||
luasnip.jump(1)
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, { 'i', 's' }),
|
|
||||||
|
|
||||||
['<S-Tab>'] = cmp.mapping(function(fallback)
|
|
||||||
if cmp.visible() then
|
|
||||||
cmp.select_prev_item()
|
|
||||||
elseif luasnip.locally_jumpable(-1) then
|
|
||||||
luasnip.jump(-1)
|
|
||||||
else
|
|
||||||
fallback()
|
|
||||||
end
|
|
||||||
end, { 'i', 's' }),
|
|
||||||
|
|
||||||
-- Ctrl+Space to trigger completion menu
|
|
||||||
['<C-Space>'] = cmp.mapping.complete(),
|
|
||||||
|
|
||||||
-- Scroll up and down in the completion documentation
|
|
||||||
['<C-u>'] = cmp.mapping.scroll_docs(-4),
|
|
||||||
['<C-d>'] = cmp.mapping.scroll_docs(4),
|
|
||||||
}),
|
|
||||||
snippet = {
|
|
||||||
expand = function(args)
|
|
||||||
require('luasnip').lsp_expand(args.body)
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
|
|
||||||
})
|
|
||||||
|
|
||||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
|
||||||
local pythonLineLength = 95
|
local pythonLineLength = 95
|
||||||
lspconfig.pylsp.setup {
|
lspconfig.pylsp.setup {
|
||||||
settings = {
|
settings = {
|
||||||
pylsp = {
|
pylsp = {
|
||||||
plugins = {
|
plugins = {
|
||||||
|
autopep8 = {
|
||||||
|
enabled = false,
|
||||||
|
},
|
||||||
|
yapf = {
|
||||||
|
enabled = true,
|
||||||
|
},
|
||||||
pycodestyle = {
|
pycodestyle = {
|
||||||
ignore = { 'W391' },
|
ignore = { 'W391' },
|
||||||
maxLineLength = pythonLineLength
|
maxLineLength = pythonLineLength
|
||||||
@@ -146,10 +91,18 @@ return {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
lspconfig.yamlls.setup {
|
lspconfig.yamlls.setup {}
|
||||||
capabilities = capabilities,
|
lspconfig.helm_ls.setup {
|
||||||
|
settings = {
|
||||||
|
['helm-ls'] = {
|
||||||
|
yamlls = {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
lspconfig.terraformls.setup {
|
lspconfig.terraformls.setup {
|
||||||
filetypes = { 'terraform', 'terraform-vars', 'tf' }
|
filetypes = { 'terraform', 'terraform-vars', 'tf' }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ return {
|
|||||||
lualine_c = {
|
lualine_c = {
|
||||||
{
|
{
|
||||||
'filename',
|
'filename',
|
||||||
path = 4,
|
path = 1,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'navic',
|
'navic',
|
||||||
|
|||||||
@@ -1,22 +1,13 @@
|
|||||||
return {
|
return {
|
||||||
'epwalsh/obsidian.nvim',
|
'obsidian-nvim/obsidian.nvim',
|
||||||
version = '*', -- recommended, use latest release instead of latest commit
|
version = '*', -- recommended, use latest release instead of latest commit
|
||||||
-- lazy = true,
|
|
||||||
-- Replace the above line with this if you only want to load obsidian.nvim for markdown files in your vault:
|
|
||||||
-- event = {
|
|
||||||
-- -- If you want to use the home shortcut '~' here you need to call 'vim.fn.expand'.
|
|
||||||
-- -- E.g. 'BufReadPre ' .. vim.fn.expand '~' .. '/my-vault/*.md'
|
|
||||||
-- -- refer to `:h file-pattern` for more examples
|
|
||||||
-- 'BufReadPre /Users/rtim/Documents/Notes/tech-work-hobby/*.md',
|
|
||||||
-- 'BufNewFile /Users/rtim/Documents/Notes/tech-work-hobby/*.md',
|
|
||||||
-- },
|
|
||||||
dependencies = {
|
dependencies = {
|
||||||
-- Required.
|
-- Required.
|
||||||
'nvim-lua/plenary.nvim',
|
'nvim-lua/plenary.nvim',
|
||||||
},
|
},
|
||||||
keys = {
|
keys = {
|
||||||
{'<leader>ot', '<cmd>ObsidianToday<CR>', desc = "Open today's daily note"},
|
{ '<leader>ot', '<cmd>ObsidianToday<CR>', desc = "Open today's daily note" },
|
||||||
{'<leader>os', '<cmd>ObsidianQuickSwitch<CR>', desc = 'Search notes in my vault and switch to selected'},
|
{ '<leader>os', '<cmd>ObsidianQuickSwitch<CR>', desc = 'Search notes in my vault and switch to selected' },
|
||||||
},
|
},
|
||||||
mappings = {
|
mappings = {
|
||||||
-- Overrides the 'gf' mapping to work on markdown/wiki links within your vault.
|
-- Overrides the 'gf' mapping to work on markdown/wiki links within your vault.
|
||||||
@@ -50,12 +41,16 @@ return {
|
|||||||
},
|
},
|
||||||
daily_notes = {
|
daily_notes = {
|
||||||
folder = 'Daily',
|
folder = 'Daily',
|
||||||
date_format = '%d-%b-%y (%A)',
|
date_format = '%Y-%m-%d (%A)',
|
||||||
default_tags = { 'daily' },
|
default_tags = { 'daily' },
|
||||||
template = 'Daily.md',
|
template = 'Daily.md',
|
||||||
},
|
},
|
||||||
templates = {
|
templates = {
|
||||||
folder = 'Templates',
|
folder = 'Templates',
|
||||||
|
},
|
||||||
|
completion = {
|
||||||
|
blink = true,
|
||||||
|
nvim_cmp = false,
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|||||||
56
lua/crentist/lazy/pairs.lua
Normal file
56
lua/crentist/lazy/pairs.lua
Normal file
@@ -0,0 +1,56 @@
|
|||||||
|
return {
|
||||||
|
'echasnovski/mini.pairs',
|
||||||
|
event = 'VeryLazy',
|
||||||
|
opts = {
|
||||||
|
modes = { insert = true, command = true, terminal = false },
|
||||||
|
-- skip autopair when next character is one of these
|
||||||
|
skip_next = [=[[%w%%%'%[%"%.%`%$]]=],
|
||||||
|
-- skip autopair when the cursor is inside these treesitter nodes
|
||||||
|
skip_ts = { "string" },
|
||||||
|
-- skip autopair when next character is closing pair
|
||||||
|
-- and there are more closing pairs than opening pairs
|
||||||
|
skip_unbalanced = true,
|
||||||
|
-- better deal with markdown code blocks
|
||||||
|
markdown = true,
|
||||||
|
},
|
||||||
|
|
||||||
|
config = function(_, opts)
|
||||||
|
local pairs = require("mini.pairs")
|
||||||
|
pairs.setup(opts)
|
||||||
|
local open = pairs.open
|
||||||
|
pairs.open = function(pair, neigh_pattern)
|
||||||
|
if vim.fn.getcmdline() ~= "" then
|
||||||
|
return open(pair, neigh_pattern)
|
||||||
|
end
|
||||||
|
local o, c = pair:sub(1, 1), pair:sub(2, 2)
|
||||||
|
local line = vim.api.nvim_get_current_line()
|
||||||
|
local cursor = vim.api.nvim_win_get_cursor(0)
|
||||||
|
local next = line:sub(cursor[2] + 1, cursor[2] + 1)
|
||||||
|
local before = line:sub(1, cursor[2])
|
||||||
|
if opts.markdown and o == "`" and vim.bo.filetype == "markdown" and before:match("^%s*``") then
|
||||||
|
return "`\n```" .. vim.api.nvim_replace_termcodes("<up>", true, true, true)
|
||||||
|
end
|
||||||
|
if opts.skip_next and next ~= "" and next:match(opts.skip_next) then
|
||||||
|
return o
|
||||||
|
end
|
||||||
|
if opts.skip_ts and #opts.skip_ts > 0 then
|
||||||
|
local ok, captures = pcall(vim.treesitter.get_captures_at_pos, 0, cursor[1] - 1,
|
||||||
|
math.max(cursor[2] - 1, 0))
|
||||||
|
for _, capture in ipairs(ok and captures or {}) do
|
||||||
|
if vim.tbl_contains(opts.skip_ts, capture.capture) then
|
||||||
|
return o
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
if opts.skip_unbalanced and next == c and c ~= o then
|
||||||
|
local _, count_open = line:gsub(vim.pesc(pair:sub(1, 1)), "")
|
||||||
|
local _, count_close = line:gsub(vim.pesc(pair:sub(2, 2)), "")
|
||||||
|
if count_close > count_open then
|
||||||
|
return o
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return open(pair, neigh_pattern)
|
||||||
|
end
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
|
||||||
45
lua/crentist/lazy/parrot.lua
Normal file
45
lua/crentist/lazy/parrot.lua
Normal file
@@ -0,0 +1,45 @@
|
|||||||
|
return {
|
||||||
|
'frankroeder/parrot.nvim',
|
||||||
|
version = "2.1.0",
|
||||||
|
dependencies = { 'ibhagwan/fzf-lua', 'nvim-lua/plenary.nvim' },
|
||||||
|
opts = {
|
||||||
|
providers = {
|
||||||
|
anthropic = {
|
||||||
|
name = "anthropic",
|
||||||
|
endpoint = "https://api.anthropic.com/v1/messages",
|
||||||
|
model_endpoint = "https://api.anthropic.com/v1/models",
|
||||||
|
api_key = { "/usr/local/bin/sops", "--config", "/dev/null", "-d", vim.fn.expand("$HOME") .. "/.claude-api" },
|
||||||
|
headers = function(self)
|
||||||
|
return {
|
||||||
|
["Content-Type"] = "application/json",
|
||||||
|
["x-api-key"] = self.api_key,
|
||||||
|
["anthropic-version"] = "2023-06-01",
|
||||||
|
}
|
||||||
|
end,
|
||||||
|
params = {
|
||||||
|
chat = { max_tokens = 4096 },
|
||||||
|
command = { max_tokens = 4096 },
|
||||||
|
},
|
||||||
|
models = {
|
||||||
|
"claude-sonnet-4-20250514",
|
||||||
|
"claude-3-7-sonnet-20250219",
|
||||||
|
"claude-3-5-sonnet-20241022",
|
||||||
|
"claude-3-5-haiku-20241022",
|
||||||
|
},
|
||||||
|
preprocess_payload = function(payload)
|
||||||
|
for _, message in ipairs(payload.messages) do
|
||||||
|
message.content = message.content:gsub("^%s*(.-)%s*$", "%1")
|
||||||
|
end
|
||||||
|
if payload.messages[1] and payload.messages[1].role == "system" then
|
||||||
|
-- remove the first message that serves as the system prompt as anthropic
|
||||||
|
-- expects the system prompt to be part of the API call body and not the messages
|
||||||
|
payload.system = payload.messages[1].content
|
||||||
|
table.remove(payload.messages, 1)
|
||||||
|
end
|
||||||
|
return payload
|
||||||
|
end,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,13 +1,10 @@
|
|||||||
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' },
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,8 +3,7 @@ return {
|
|||||||
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
version = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||||
event = "VeryLazy",
|
event = "VeryLazy",
|
||||||
config = function()
|
config = function()
|
||||||
require("nvim-surround").setup({
|
require("nvim-surround").setup({})
|
||||||
-- Configuration here, or leave empty to use defaults
|
|
||||||
})
|
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
'nvim-treesitter/nvim-treesitter',
|
'nvim-treesitter/nvim-treesitter',
|
||||||
|
branch='master',
|
||||||
build = ":TSUpdate",
|
build = ":TSUpdate",
|
||||||
config = function()
|
config = function()
|
||||||
require("nvim-treesitter.configs").setup({
|
require("nvim-treesitter.configs").setup({
|
||||||
|
|||||||
@@ -11,8 +11,8 @@ return {
|
|||||||
require('statuscol').setup({
|
require('statuscol').setup({
|
||||||
relculright = true,
|
relculright = true,
|
||||||
segments = {
|
segments = {
|
||||||
{ text = { builtin.foldfunc }, sign = { colwidth = 2 }, click = 'v:lua.ScFa', },
|
{ text = { builtin.foldfunc }, sign = { colwidth = 1 }, click = 'v:lua.ScFa', },
|
||||||
{ text = { '%s' }, click = 'v:lua.ScSa', hl = 'FoldColumn' },
|
{ text = { '%s' }, sign = { colwidth = 1 }, click = 'v:lua.ScSa', hl = 'FoldColumn' },
|
||||||
{ text = { builtin.lnumfunc, ' ' }, click = 'v:lua.ScLa', hl = 'FoldColumn' },
|
{ text = { builtin.lnumfunc, ' ' }, click = 'v:lua.ScLa', hl = 'FoldColumn' },
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -108,3 +108,21 @@ 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 })
|
||||||
|
|
||||||
|
|||||||
@@ -1,42 +1,3 @@
|
|||||||
-- https://www.youtube.com/watch?v=q-oBU2fO1H4&t=189s
|
-- https://www.youtube.com/watch?v=q-oBU2fO1H4&t=189s
|
||||||
local null_ls = require("null-ls")
|
local null_ls = require("null-ls")
|
||||||
|
|
||||||
-- local function check_if_comment(node, params)
|
|
||||||
-- if node == 'nil' then return false
|
|
||||||
-- if node:type() ~= 'comment' or node:type() ~= 'comment_content' then return false end
|
|
||||||
--
|
|
||||||
-- if node:type() == 'comment' then
|
|
||||||
-- local child = node:child()
|
|
||||||
--
|
|
||||||
-- if child == 'nil' then return false end
|
|
||||||
-- end
|
|
||||||
--
|
|
||||||
-- -- node exists and is a part of comment
|
|
||||||
-- if node == 'nil' or node:type() ~= 'comment' or node:type() ~= 'comment_content' then return false end
|
|
||||||
--
|
|
||||||
-- local parent = node:parent()
|
|
||||||
-- if parent == 'nil' or parent:type() ~= 'comment' then return false end
|
|
||||||
--
|
|
||||||
-- local text = vim.treesitter.get_node_text(node, )
|
|
||||||
-- end
|
|
||||||
|
|
||||||
-- null_ls.register({
|
|
||||||
-- name = 'Comment actions',
|
|
||||||
-- method = null_ls.methods.CODE_ACTION,
|
|
||||||
-- filetypes = {},
|
|
||||||
-- generator = {
|
|
||||||
-- fn = function(params)
|
|
||||||
-- local out = {}
|
|
||||||
--
|
|
||||||
-- table.insert(out,
|
|
||||||
-- {
|
|
||||||
-- title = 'Test',
|
|
||||||
-- action = function()
|
|
||||||
-- print(vim.treesitter.get_node())
|
|
||||||
-- end
|
|
||||||
-- })
|
|
||||||
-- return out
|
|
||||||
-- end
|
|
||||||
-- }
|
|
||||||
-- })
|
|
||||||
|
|
||||||
|
|||||||
@@ -31,10 +31,10 @@ vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><
|
|||||||
|
|
||||||
vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
|
vim.keymap.set("n", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
|
||||||
|
|
||||||
vim.keymap.set("n", "<space><space>x", "<cmd>source %<CR>")
|
vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>")
|
||||||
vim.keymap.set("n", "<space>x", ":.lua<CR>")
|
vim.keymap.set("n", "<leader>x", ":.lua<CR>")
|
||||||
vim.keymap.set("v", "<space>x", ":lua<CR>")
|
vim.keymap.set("v", "<leader>x", ":lua<CR>")
|
||||||
|
|
||||||
vim.keymap.set("n", "<M-j>", "<cmd>cnext<CR>")
|
vim.keymap.set("n", "<C-M-j>", "<cmd>cnext<CR>")
|
||||||
vim.keymap.set("n", "<M-k>", "<cmd>cprev<CR>")
|
vim.keymap.set("n", "<C-M-k>", "<cmd>cprev<CR>")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user