Compare commits
1 Commits
0ba639e806
...
feature/de
| Author | SHA1 | Date | |
|---|---|---|---|
| 31c93a8fe5 |
@@ -1,45 +1,43 @@
|
|||||||
{
|
{
|
||||||
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
"LuaSnip": { "branch": "master", "commit": "458560534a73f7f8d7a11a146c801db00b081df0" },
|
||||||
"blink-ripgrep.nvim": { "branch": "main", "commit": "e06614bda3ab0ff6d6ec8bb17a9326be7a705daf" },
|
"blink-ripgrep.nvim": { "branch": "main", "commit": "12fb7348cf9d32a0ed2e3ab4960d561632e57ba4" },
|
||||||
"blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" },
|
"blink.cmp": { "branch": "main", "commit": "9bcb14b43852a6f2bfd5ac9ef29cb5cf09b1b39b" },
|
||||||
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
"dressing.nvim": { "branch": "master", "commit": "2d7c2db2507fa3c4956142ee607431ddb2828639" },
|
||||||
"fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" },
|
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
|
||||||
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
"friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" },
|
||||||
"fzf-lua": { "branch": "main", "commit": "2c4c75e71eedbedd55ea13ab3400f72a2336e672" },
|
"fzf-lua": { "branch": "main", "commit": "c53ba4f40f0514a5038646fb1e9ce05872b18eb1" },
|
||||||
"gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" },
|
"gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
|
||||||
"gruvbox.nvim": { "branch": "main", "commit": "12c2624287dc827edb5d72b2bc4c9619e692a554" },
|
"gruvbox.nvim": { "branch": "main", "commit": "00e38a379bab3389e187b3953566d67d494dfddd" },
|
||||||
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
|
"harpoon": { "branch": "harpoon2", "commit": "ed1f853847ffd04b2b61c314865665e1dadf22c7" },
|
||||||
"hererocks": { "branch": "master", "commit": "d2e2b7ab1ce5b6d4e517619746a810159f0e18db" },
|
"hererocks": { "branch": "master", "commit": "4ce92131e9858950440ab99a25db9a9b43db8cd4" },
|
||||||
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
|
||||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||||
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
|
||||||
"lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" },
|
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "1ec4da522fa49dcecee8d190efda273464dd2192" },
|
"mason-lspconfig.nvim": { "branch": "main", "commit": "f54e3c11fc9ebfcfc27e696182b0295b071d0811" },
|
||||||
"mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" },
|
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||||
"mini.pairs": { "branch": "main", "commit": "1e1ca3f60f58d4050bf814902b472eec9963a5dd" },
|
"mini.pairs": { "branch": "main", "commit": "42407ccb80ec59c84e7c91d815f42ed90a8cc093" },
|
||||||
"none-ls.nvim": { "branch": "main", "commit": "53ec77181d96494b9dc9457110dd62dc623cc78d" },
|
"none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
|
||||||
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
|
||||||
"nvim-lspconfig": { "branch": "master", "commit": "3db16ceeea947517f0dc1404c24dcb5ab0c91d26" },
|
"nvim-lspconfig": { "branch": "master", "commit": "056f569f71e4b726323b799b9cfacc53653bceb3" },
|
||||||
"nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
|
"nvim-navic": { "branch": "master", "commit": "f887d794a0f4594882814d7780980a949200a238" },
|
||||||
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
|
"nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
|
||||||
"nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" },
|
"nvim-surround": { "branch": "main", "commit": "8dd9150ca7eae5683660ea20cec86edcd5ca4046" },
|
||||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||||
"nvim-ufo": { "branch": "main", "commit": "d31e2a9fd572a25a4d5011776677223a8ccb7e35" },
|
"nvim-ufo": { "branch": "main", "commit": "80fe8215ba566df2fbf3bf4d25f59ff8f41bc0e1" },
|
||||||
"nvim-web-devicons": { "branch": "master", "commit": "4ae47f4fb18e85b80e84b729974fe65483b06aaf" },
|
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||||
"obsidian.nvim": { "branch": "main", "commit": "705cc9b4f66eca1e54040ac819102e80a32896d3" },
|
"obsidian.nvim": { "branch": "main", "commit": "2f0222b3eb20382cadf3e1d91f368318b768771c" },
|
||||||
"oil.nvim": { "branch": "master", "commit": "07f80ad645895af849a597d1cac897059d89b686" },
|
"oil.nvim": { "branch": "master", "commit": "08c2bce8b00fd780fb7999dbffdf7cd174e896fb" },
|
||||||
"parrot.nvim": { "branch": "main", "commit": "0477748832812707e53db078d0180299a0c15d6c" },
|
"parrot.nvim": { "branch": "main", "commit": "0477748832812707e53db078d0180299a0c15d6c" },
|
||||||
"plenary": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
"plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
|
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||||
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
"promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" },
|
||||||
"render-markdown.nvim": { "branch": "main", "commit": "f626e90bbc4b3d8f4fd29c909d958b165af13f4a" },
|
|
||||||
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
|
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
|
||||||
"statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" },
|
"statuscol.nvim": { "branch": "main", "commit": "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc" },
|
||||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
|
||||||
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
"telescope.nvim": { "branch": "master", "commit": "b4da76be54691e854d3e0e02c36b0245f945c2c7" },
|
||||||
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
"trouble.nvim": { "branch": "main", "commit": "85bedb7eb7fa331a2ccbecb9202d8abba64d37b3" },
|
||||||
"undotree": { "branch": "master", "commit": "28f2f54a34baff90ea6f4a735ef1813ad875c743" },
|
"undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" },
|
||||||
"vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" },
|
"vim-fugitive": { "branch": "master", "commit": "4a745ea72fa93bb15dd077109afbb3d1809383f2" },
|
||||||
"vim-helm": { "branch": "master", "commit": "cc5ac22444332381f38084a6c7f023c25eef6201" },
|
"vim-helm": { "branch": "master", "commit": "cc5ac22444332381f38084a6c7f023c25eef6201" }
|
||||||
"vim-illuminate": { "branch": "master", "commit": "0d1e93684da00ab7c057410fecfc24f434698898" }
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,7 @@ return {
|
|||||||
config = function()
|
config = function()
|
||||||
local gruvbox = require('gruvbox')
|
local gruvbox = require('gruvbox')
|
||||||
|
|
||||||
---@module 'gruvbox'
|
gruvbox.setup({
|
||||||
---@type GruvboxConfig
|
|
||||||
local gruvbox_settings = {
|
|
||||||
transparent_mode = false,
|
transparent_mode = false,
|
||||||
italic = {
|
italic = {
|
||||||
strings = false,
|
strings = false,
|
||||||
@@ -26,9 +24,7 @@ return {
|
|||||||
GruvboxAquaSign = { bg = '' },
|
GruvboxAquaSign = { bg = '' },
|
||||||
GruvboxOrangeSign = { bg = '' },
|
GruvboxOrangeSign = { bg = '' },
|
||||||
}
|
}
|
||||||
}
|
})
|
||||||
|
|
||||||
gruvbox.setup(gruvbox_settings)
|
|
||||||
vim.cmd('colorscheme gruvbox')
|
vim.cmd('colorscheme gruvbox')
|
||||||
|
|
||||||
vim.api.nvim_set_hl(0, 'SignColumn', { link = 'FoldColumn' })
|
vim.api.nvim_set_hl(0, 'SignColumn', { link = 'FoldColumn' })
|
||||||
|
|||||||
@@ -7,25 +7,13 @@ return {
|
|||||||
{ 'L3MON4D3/LuaSnip', version = 'v2.*' }
|
{ 'L3MON4D3/LuaSnip', version = 'v2.*' }
|
||||||
},
|
},
|
||||||
-- use a release tag to download pre-built binaries
|
-- use a release tag to download pre-built binaries
|
||||||
version = 'v1.6.*',
|
version = 'v1.4.*',
|
||||||
|
|
||||||
---@module 'blink-cmp'
|
|
||||||
---@type blink.cmp.Config
|
|
||||||
opts = {
|
opts = {
|
||||||
fuzzy = { implementation = 'prefer_rust_with_warning' },
|
fuzzy = { implementation = 'prefer_rust_with_warning' },
|
||||||
|
|
||||||
snippets = {
|
snippets = {
|
||||||
preset = 'luasnip',
|
preset = 'luasnip',
|
||||||
active = function(filter)
|
|
||||||
local snippet = require('luasnip')
|
|
||||||
local blink = require('blink.cmp')
|
|
||||||
if snippet.in_snippet() and not blink.is_visible() then
|
|
||||||
return true
|
|
||||||
else
|
|
||||||
if not snippet.in_snippet() and vim.fn.mode() == 'n' then snippet.unlink_current() end
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
end
|
|
||||||
},
|
},
|
||||||
|
|
||||||
cmdline = {
|
cmdline = {
|
||||||
@@ -58,25 +46,25 @@ return {
|
|||||||
ripgrep = {
|
ripgrep = {
|
||||||
module = 'blink-ripgrep',
|
module = 'blink-ripgrep',
|
||||||
name = 'Ripgrep',
|
name = 'Ripgrep',
|
||||||
score_offset = -5,
|
score_offset = -2,
|
||||||
-- the options below are optional, some default values are shown
|
-- the options below are optional, some default values are shown
|
||||||
---@module 'blink-ripgrep'
|
---@module 'blink-ripgrep'
|
||||||
---@type blink-ripgrep.Options
|
---@type blink-ripgrep.Options
|
||||||
opts = {
|
opts = {
|
||||||
backend = {
|
max_filesize = '1M',
|
||||||
use = 'ripgrep',
|
|
||||||
},
|
|
||||||
ripgrep = {
|
|
||||||
ignore_paths = {},
|
|
||||||
additional_paths = {},
|
|
||||||
additional_rg_options = {},
|
|
||||||
max_filesize = '1M',
|
|
||||||
project_root_fallback = true,
|
|
||||||
search_casing = '--ignore-case',
|
|
||||||
},
|
|
||||||
project_root_marker = '.git',
|
project_root_marker = '.git',
|
||||||
|
project_root_fallback = true,
|
||||||
|
search_casing = '--ignore-case',
|
||||||
|
additional_rg_options = {},
|
||||||
fallback_to_regex_highlighting = true,
|
fallback_to_regex_highlighting = true,
|
||||||
toggles = { debug = nil, },
|
ignore_paths = {},
|
||||||
|
additional_paths = {},
|
||||||
|
future_features = {
|
||||||
|
backend = {
|
||||||
|
use = 'ripgrep',
|
||||||
|
},
|
||||||
|
},
|
||||||
|
debug = false,
|
||||||
},
|
},
|
||||||
transform_items = function(_, items)
|
transform_items = function(_, items)
|
||||||
for _, item in ipairs(items) do
|
for _, item in ipairs(items) do
|
||||||
|
|||||||
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,7 +1,4 @@
|
|||||||
return {
|
return {
|
||||||
'stevearc/dressing.nvim',
|
'stevearc/dressing.nvim',
|
||||||
---@module 'dressing'
|
|
||||||
---@type dressing.InputConfig
|
|
||||||
opts = {},
|
opts = {},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,35 +1,34 @@
|
|||||||
return {
|
return {
|
||||||
'tpope/vim-fugitive',
|
"tpope/vim-fugitive",
|
||||||
config = function()
|
config = function()
|
||||||
vim.keymap.set('n', "<leader>gs", vim.cmd.Git)
|
vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
|
||||||
|
|
||||||
local Crentist_Fugitive = vim.api.nvim_create_augroup('Crentist_Fugitive', {})
|
local Crentist_Fugitive = vim.api.nvim_create_augroup("Crentist_Fugitive", {})
|
||||||
|
|
||||||
local autocmd = vim.api.nvim_create_autocmd
|
local autocmd = vim.api.nvim_create_autocmd
|
||||||
autocmd('BufWinEnter', {
|
autocmd("BufWinEnter", {
|
||||||
group = Crentist_Fugitive,
|
group = Crentist_Fugitive,
|
||||||
pattern = '*',
|
pattern = "*",
|
||||||
callback = function()
|
callback = function()
|
||||||
if vim.bo.ft ~= 'fugitive' then
|
if vim.bo.ft ~= "fugitive" then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
local bufnr = vim.api.nvim_get_current_buf()
|
local bufnr = vim.api.nvim_get_current_buf()
|
||||||
local opts = {buffer = bufnr, remap = false}
|
local opts = {buffer = bufnr, remap = false}
|
||||||
vim.keymap.set('n', "<leader>p", function()
|
vim.keymap.set("n", "<leader>p", function()
|
||||||
vim.cmd.Git('push')
|
vim.cmd.Git('push')
|
||||||
end, opts)
|
end, opts)
|
||||||
|
|
||||||
-- rebase always
|
-- rebase always
|
||||||
vim.keymap.set('n', "<leader>P", function()
|
vim.keymap.set("n", "<leader>P", function()
|
||||||
vim.cmd.Git({'pull', '--rebase'})
|
vim.cmd.Git({'pull', '--rebase'})
|
||||||
end, opts)
|
end, opts)
|
||||||
|
|
||||||
-- NOTE: It allows me to easily set the branch i am pushing and any tracking
|
-- NOTE: It allows me to easily set the branch i am pushing and any tracking
|
||||||
-- needed if i did not set the branch up correctly
|
-- needed if i did not set the branch up correctly
|
||||||
vim.keymap.set('n', "<leader>t", ":Git push -u origin ", opts);
|
vim.keymap.set("n", "<leader>t", ":Git push -u origin ", opts);
|
||||||
end,
|
end,
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,74 +1,11 @@
|
|||||||
return {
|
return {
|
||||||
'lewis6991/gitsigns.nvim',
|
"lewis6991/gitsigns.nvim",
|
||||||
---@module 'gitsigns.config'
|
|
||||||
---@type Gitsigns.Config
|
|
||||||
opts = {
|
opts = {
|
||||||
current_line_blame = true,
|
current_line_blame = true,
|
||||||
attach_to_untracked = true,
|
attach_to_untracked = true,
|
||||||
current_line_blame_opts = {
|
current_line_blame_opts = {
|
||||||
delay = 500,
|
delay = 500,
|
||||||
ignore_whitespace = true,
|
|
||||||
virt_text_pos = 'right_align',
|
|
||||||
},
|
},
|
||||||
on_attach = function(bufnr)
|
|
||||||
local gitsigns = require('gitsigns')
|
|
||||||
|
|
||||||
local function map(mode, l, r, opts)
|
|
||||||
opts = opts or {}
|
|
||||||
opts.buffer = bufnr
|
|
||||||
vim.keymap.set(mode, l, r, opts)
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Navigation
|
|
||||||
map('n', ']c', function()
|
|
||||||
if vim.wo.diff then
|
|
||||||
vim.cmd.normal({ ']c', bang = true })
|
|
||||||
else
|
|
||||||
gitsigns.nav_hunk('next')
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
|
||||||
map('n', '[c', function()
|
|
||||||
if vim.wo.diff then
|
|
||||||
vim.cmd.normal({ '[c', bang = true })
|
|
||||||
else
|
|
||||||
gitsigns.nav_hunk('prev')
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
|
||||||
-- Actions
|
|
||||||
map('n', '<leader>hs', gitsigns.stage_hunk)
|
|
||||||
map('n', '<leader>hr', gitsigns.reset_hunk)
|
|
||||||
|
|
||||||
map('v', '<leader>hs', function()
|
|
||||||
gitsigns.stage_hunk({ vim.fn.line('.'), vim.fn.line('v') })
|
|
||||||
end)
|
|
||||||
|
|
||||||
map('v', '<leader>hr', function()
|
|
||||||
gitsigns.reset_hunk({ vim.fn.line('.'), vim.fn.line('v') })
|
|
||||||
end)
|
|
||||||
|
|
||||||
map('n', '<leader>hS', gitsigns.stage_buffer)
|
|
||||||
map('n', '<leader>hR', gitsigns.reset_buffer)
|
|
||||||
map('n', '<leader>hp', gitsigns.preview_hunk)
|
|
||||||
map('n', '<leader>hi', gitsigns.preview_hunk_inline)
|
|
||||||
|
|
||||||
map('n', '<leader>hd', gitsigns.diffthis)
|
|
||||||
|
|
||||||
map('n', '<leader>hD', function()
|
|
||||||
gitsigns.diffthis('~')
|
|
||||||
end)
|
|
||||||
|
|
||||||
map('n', '<leader>hQ', function() gitsigns.setqflist('all') end)
|
|
||||||
map('n', '<leader>hq', gitsigns.setqflist)
|
|
||||||
|
|
||||||
-- Toggles
|
|
||||||
map('n', '<leader>tb', gitsigns.toggle_current_line_blame)
|
|
||||||
map('n', '<leader>tw', gitsigns.toggle_word_diff)
|
|
||||||
|
|
||||||
-- Text object
|
|
||||||
map({ 'o', 'x' }, 'ih', gitsigns.select_hunk)
|
|
||||||
end
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,14 +1,14 @@
|
|||||||
return {
|
return {
|
||||||
'theprimeagen/harpoon',
|
"theprimeagen/harpoon",
|
||||||
branch = 'harpoon2',
|
branch = "harpoon2",
|
||||||
dependencies = { 'nvim-lua/plenary.nvim' },
|
dependencies = { "nvim-lua/plenary.nvim" },
|
||||||
config = function()
|
config = function()
|
||||||
local harpoon = require('harpoon')
|
local harpoon = require("harpoon")
|
||||||
|
|
||||||
harpoon:setup()
|
harpoon:setup()
|
||||||
|
|
||||||
-- basic telescope configuration
|
-- basic telescope configuration
|
||||||
local conf = require('telescope.config').values
|
local conf = require("telescope.config").values
|
||||||
local function toggle_telescope(harpoon_files)
|
local function toggle_telescope(harpoon_files)
|
||||||
local file_paths = {}
|
local file_paths = {}
|
||||||
for _, item in ipairs(harpoon_files.items) do
|
for _, item in ipairs(harpoon_files.items) do
|
||||||
@@ -16,8 +16,8 @@ return {
|
|||||||
end
|
end
|
||||||
|
|
||||||
require('telescope.pickers').new({}, {
|
require('telescope.pickers').new({}, {
|
||||||
prompt_title = 'Harpoon',
|
prompt_title = "Harpoon",
|
||||||
finder = require('telescope.finders').new_table({
|
finder = require("telescope.finders").new_table({
|
||||||
results = file_paths,
|
results = file_paths,
|
||||||
}),
|
}),
|
||||||
previewer = conf.file_previewer({}),
|
previewer = conf.file_previewer({}),
|
||||||
@@ -25,15 +25,15 @@ return {
|
|||||||
}):find()
|
}):find()
|
||||||
end
|
end
|
||||||
|
|
||||||
vim.keymap.set('n', '<leader>a', function() harpoon:list():add() end)
|
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-e>", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
|
||||||
vim.keymap.set('n', '<leader><C-e>', function() toggle_telescope(harpoon:list()) end,
|
vim.keymap.set("n", "<leader><C-e>", function() toggle_telescope(harpoon:list()) end,
|
||||||
{ desc = 'Open harpoon window' })
|
{ desc = "Open harpoon window" })
|
||||||
|
|
||||||
vim.keymap.set('n', '<C-h>', function() harpoon:list():select(1) 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-j>", function() harpoon:list():select(2) end)
|
||||||
vim.keymap.set('n', '<C-k>', function() harpoon:list():select(3) 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)
|
vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +0,0 @@
|
|||||||
return {
|
|
||||||
'RRethy/vim-illuminate',
|
|
||||||
config = function ()
|
|
||||||
local illuminate = require('illuminate')
|
|
||||||
illuminate.configure()
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -1,2 +1 @@
|
|||||||
return { 'lukas-reineke/indent-blankline.nvim', main = 'ibl', opts = {} }
|
return { "lukas-reineke/indent-blankline.nvim", main = "ibl", opts = {} }
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
{
|
{
|
||||||
'nvim-lua/plenary.nvim',
|
"nvim-lua/plenary.nvim",
|
||||||
name = 'plenary'
|
name = "plenary"
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
return {
|
return {
|
||||||
'neovim/nvim-lspconfig',
|
'neovim/nvim-lspconfig',
|
||||||
version = '^2.3.0',
|
tag = 'v1.0.0',
|
||||||
dependencies = {
|
dependencies = {
|
||||||
'williamboman/mason.nvim',
|
'williamboman/mason.nvim',
|
||||||
'williamboman/mason-lspconfig.nvim',
|
'williamboman/mason-lspconfig.nvim',
|
||||||
@@ -32,10 +32,8 @@ return {
|
|||||||
|
|
||||||
require('fidget').setup({})
|
require('fidget').setup({})
|
||||||
require('mason').setup({})
|
require('mason').setup({})
|
||||||
---@module 'mason-lspconfig'
|
|
||||||
---@type MasonLspconfigSettings
|
|
||||||
require('mason-lspconfig').setup({
|
require('mason-lspconfig').setup({
|
||||||
automatic_enable = true,
|
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 = {
|
||||||
@@ -50,18 +48,20 @@ return {
|
|||||||
'helm_ls',
|
'helm_ls',
|
||||||
'marksman',
|
'marksman',
|
||||||
},
|
},
|
||||||
|
handlers = {
|
||||||
|
function(server_name)
|
||||||
|
local capabilities = require('blink.cmp').get_lsp_capabilities()
|
||||||
|
require('lspconfig')[server_name].setup({
|
||||||
|
capabilities = capabilities
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
local lazydev = require('lazydev')
|
local pythonLineLength = 95
|
||||||
lazydev.setup()
|
lspconfig.pylsp.setup {
|
||||||
vim.lsp.config('lua_ls', {
|
|
||||||
root_dir = function(bufnr, on_dir) on_dir(lazydev.find_workspace(bufnr)) end
|
|
||||||
})
|
|
||||||
|
|
||||||
---@type lspconfig.Config
|
|
||||||
vim.lsp.config('pylsp', {
|
|
||||||
settings = {
|
settings = {
|
||||||
['pylsp'] = {
|
pylsp = {
|
||||||
plugins = {
|
plugins = {
|
||||||
autopep8 = {
|
autopep8 = {
|
||||||
enabled = false,
|
enabled = false,
|
||||||
@@ -71,38 +71,41 @@ return {
|
|||||||
},
|
},
|
||||||
pycodestyle = {
|
pycodestyle = {
|
||||||
ignore = { 'W391' },
|
ignore = { 'W391' },
|
||||||
maxLineLength = 95,
|
maxLineLength = pythonLineLength
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
}
|
||||||
|
lspconfig.ansiblels.setup {}
|
||||||
|
|
||||||
|
lspconfig.lua_ls.setup {}
|
||||||
|
|
||||||
-- leave it until it works with lsp.config
|
|
||||||
lspconfig.helm_ls.setup {
|
lspconfig.helm_ls.setup {
|
||||||
settings = {
|
settings = {
|
||||||
['helm-ls'] = {
|
['helm-ls'] = {
|
||||||
yamlls = {
|
yamlls = {
|
||||||
enabled = false,
|
path = 'yaml-language-server',
|
||||||
path = "yaml-language-server",
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
-- vim.lsp.config('helm-ls', {
|
|
||||||
-- settings = {
|
|
||||||
-- ['helm-ls'] = {
|
|
||||||
-- yamlls = {
|
|
||||||
-- path = "yaml-language-server",
|
|
||||||
-- enabled = false,
|
|
||||||
-- }
|
|
||||||
-- }
|
|
||||||
-- }
|
|
||||||
-- })
|
|
||||||
|
|
||||||
vim.lsp.config('terraformls', {
|
lspconfig.yamlls.setup {}
|
||||||
|
lspconfig.helm_ls.setup {
|
||||||
|
settings = {
|
||||||
|
['helm-ls'] = {
|
||||||
|
yamlls = {
|
||||||
|
enabled = false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
lspconfig.terraformls.setup {
|
||||||
filetypes = { 'terraform', 'terraform-vars', 'tf' }
|
filetypes = { 'terraform', 'terraform-vars', 'tf' }
|
||||||
})
|
}
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -17,54 +17,53 @@ return {
|
|||||||
lightgray = '#504945',
|
lightgray = '#504945',
|
||||||
inactivegray = '#7c6f64',
|
inactivegray = '#7c6f64',
|
||||||
}
|
}
|
||||||
require('lualine').setup(
|
require('lualine').setup({
|
||||||
{
|
options = {
|
||||||
options = {
|
theme = {
|
||||||
theme = {
|
normal = {
|
||||||
normal = {
|
a = { bg = colors.yellow, fg = colors.black, gui = 'bold' },
|
||||||
a = { bg = colors.yellow, fg = colors.black, gui = 'bold' },
|
b = { bg = colors.lightgray, fg = colors.white },
|
||||||
b = { bg = colors.lightgray, fg = colors.white },
|
c = { bg = colors.darkgray, fg = colors.white },
|
||||||
c = { bg = colors.darkgray, fg = colors.white },
|
},
|
||||||
},
|
insert = {
|
||||||
insert = {
|
a = { bg = colors.blue, fg = colors.black, gui = 'bold' },
|
||||||
a = { bg = colors.blue, fg = colors.black, gui = 'bold' },
|
b = { bg = colors.lightgray, fg = colors.white },
|
||||||
b = { bg = colors.lightgray, fg = colors.white },
|
c = { bg = colors.lightgray, fg = colors.white },
|
||||||
c = { bg = colors.lightgray, fg = colors.white },
|
},
|
||||||
},
|
visual = {
|
||||||
visual = {
|
a = { bg = colors.magenta, fg = colors.black, gui = 'bold' },
|
||||||
a = { bg = colors.magenta, fg = colors.black, gui = 'bold' },
|
b = { bg = colors.lightgray, fg = colors.white },
|
||||||
b = { bg = colors.lightgray, fg = colors.white },
|
c = { bg = colors.inactivegray, fg = colors.black },
|
||||||
c = { bg = colors.inactivegray, fg = colors.black },
|
},
|
||||||
},
|
replace = {
|
||||||
replace = {
|
a = { bg = colors.red, fg = colors.black, gui = 'bold' },
|
||||||
a = { bg = colors.red, fg = colors.black, gui = 'bold' },
|
b = { bg = colors.lightgray, fg = colors.white },
|
||||||
b = { bg = colors.lightgray, fg = colors.white },
|
c = { bg = colors.black, fg = colors.white },
|
||||||
c = { bg = colors.black, fg = colors.white },
|
},
|
||||||
},
|
command = {
|
||||||
command = {
|
a = { bg = colors.green, fg = colors.black, gui = 'bold' },
|
||||||
a = { bg = colors.green, fg = colors.black, gui = 'bold' },
|
b = { bg = colors.lightgray, fg = colors.white },
|
||||||
b = { bg = colors.lightgray, fg = colors.white },
|
c = { bg = colors.inactivegray, fg = colors.black },
|
||||||
c = { bg = colors.inactivegray, fg = colors.black },
|
},
|
||||||
},
|
inactive = {
|
||||||
inactive = {
|
a = { bg = colors.darkgray, fg = colors.magenta, gui = 'bold' },
|
||||||
a = { bg = colors.darkgray, fg = colors.magenta, gui = 'bold' },
|
b = { bg = colors.darkgray, fg = colors.magenta },
|
||||||
b = { bg = colors.darkgray, fg = colors.magenta },
|
c = { bg = colors.darkgray, fg = colors.magenta },
|
||||||
c = { bg = colors.darkgray, fg = colors.magenta },
|
},
|
||||||
},
|
|
||||||
}
|
|
||||||
},
|
|
||||||
sections = {
|
|
||||||
lualine_c = {
|
|
||||||
{
|
|
||||||
'filename',
|
|
||||||
path = 1,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
'navic',
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
})
|
},
|
||||||
|
sections = {
|
||||||
|
lualine_c = {
|
||||||
|
{
|
||||||
|
'filename',
|
||||||
|
path = 1,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
'navic',
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
return {
|
|
||||||
'MeanderingProgrammer/render-markdown.nvim',
|
|
||||||
dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
|
|
||||||
---@module 'render-markdown'
|
|
||||||
---@type render.md.UserConfig
|
|
||||||
opts = {
|
|
||||||
completions = {
|
|
||||||
blink = { enabled = true }
|
|
||||||
}
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -7,8 +7,7 @@ return {
|
|||||||
local navic = require('nvim-navic')
|
local navic = require('nvim-navic')
|
||||||
navic.setup({
|
navic.setup({
|
||||||
lsp = {
|
lsp = {
|
||||||
auto_attach = true,
|
auto_attach = true
|
||||||
preference = { 'helm_ls', 'yamlls' }
|
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,56 +1,3 @@
|
|||||||
local null_ls = require('null-ls')
|
-- https://www.youtube.com/watch?v=q-oBU2fO1H4&t=189s
|
||||||
local plenary = require('plenary')
|
local null_ls = require("null-ls")
|
||||||
|
|
||||||
local kustomize_condition = function(node, params)
|
|
||||||
if node == nil then return false end
|
|
||||||
|
|
||||||
if vim.treesitter.get_node_text(node, params['bufnr']) ~= 'resources' then return false end
|
|
||||||
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
|
|
||||||
---@module 'null-ls'
|
|
||||||
---@type
|
|
||||||
local kustomize_action = {
|
|
||||||
method = null_ls.methods.CODE_ACTION,
|
|
||||||
filetypes = { 'yaml' },
|
|
||||||
generator = {
|
|
||||||
fn = function(params)
|
|
||||||
local out = {}
|
|
||||||
local node = vim.treesitter.get_node()
|
|
||||||
if kustomize_condition(node, params) then
|
|
||||||
table.insert(out, {
|
|
||||||
title = '📁 Create resources',
|
|
||||||
action = function()
|
|
||||||
local node_below = vim.treesitter.get_node({ bufnr = 0, pos = { params['row'] + 1, 0 } })
|
|
||||||
|
|
||||||
if node_below == nil or node_below:type() ~= 'block_sequence' then
|
|
||||||
vim.api.nvim_echo({ { '❌Failed to get list items.', 'Normal' } }, false, {})
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
local checked_files = ''
|
|
||||||
for list_item, _ in node_below:iter_children() do
|
|
||||||
if list_item ~= nil then
|
|
||||||
local item_value_node = list_item:child(1) -- 0 is `-`, 1 is the actual value
|
|
||||||
if item_value_node ~= nil then
|
|
||||||
local file_name = vim.treesitter.get_node_text(item_value_node, params['bufnr'])
|
|
||||||
local file_name_path = plenary.path.new(file_name)
|
|
||||||
local current_file = plenary.path.new(vim.fn.expand('%'))
|
|
||||||
local parent = plenary.path.new(current_file:parents()[1])
|
|
||||||
local new_file = parent / file_name
|
|
||||||
new_file:touch({mode=644})
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
end
|
|
||||||
return out
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
||||||
-- null_ls.deregister(kustomize_action)
|
|
||||||
null_ls.register(kustomize_action)
|
|
||||||
|
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ vim.keymap.set({"n", "v"}, "<leader>d", [["_d]])
|
|||||||
vim.keymap.set("n", "Q", "<nop>")
|
vim.keymap.set("n", "Q", "<nop>")
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
|
vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
|
||||||
vim.keymap.set("n", "<leader>S", [[:%s/\<<C-r><C-a>\>/<C-r><C-a>/gI<Left><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>")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user