19 Commits

Author SHA1 Message Date
2338b310f2 add tmux-sessionizer keymap 2024-10-03 17:59:14 +03:00
758322bd93 formatting 2024-10-03 17:59:08 +03:00
1a2df25f5e add nvim-navic 2024-09-26 10:43:39 +03:00
aac1e91dcb ignore w391 for python 2024-09-10 17:42:00 +03:00
6d91d0c963 fix ts_ls thing, update lualine path 2024-09-07 11:30:51 +03:00
a33c92ce5b lsp: configure filetypes for tfls 2024-08-15 14:22:47 +03:00
4053addac9 add terraform ftplugin, add C-d and C-u remaps 2024-08-14 13:37:48 +03:00
751829deb0 harpoon: switch back to harpoon list 2024-08-06 13:50:42 +03:00
c0adfd43a1 configure harpoon to use telescope 2024-07-30 14:49:49 +03:00
69067d5410 add helm-ls 2024-07-30 14:49:43 +03:00
d91c167d6e oil: enable show_hidden by default 2024-07-25 13:03:33 +03:00
6a8be9a1e3 autocmd refactor 2024-07-25 12:58:37 +03:00
b685e528af add neovim config to lua-lsp 2024-07-25 12:56:11 +03:00
7200602b10 add autocmd file, add newline and whitespace trim commands 2024-07-25 12:55:52 +03:00
56316c6986 lsp: update CR mapping function 2024-07-24 11:43:30 +03:00
4ccc8ae093 add sops, change lsp select 2024-07-24 11:29:22 +03:00
8e153ee524 fix oil map, add ansible filetype 2024-07-02 14:00:16 +03:00
153f3d36c0 ignore node_modules, disable italic for strings 2024-06-22 22:48:31 +03:00
b71f7c2cce add more plugins, change some keybinds 2024-06-16 18:55:56 +03:00
18 changed files with 399 additions and 100 deletions

View File

@@ -0,0 +1 @@
vim.opt.colorcolumn = "95"

View File

@@ -0,0 +1,6 @@
vim.opt.colorcolumn = "95"
vim.opt.shiftwidth = 2
vim.opt.tabstop = 2
vim.opt.expandtab = true
vim.bo.commentstring = '# %s'

View File

@@ -1,34 +1,43 @@
{ {
"LuaSnip": { "branch": "master", "commit": "2b6860d15aaab01d3fb90859c0ba97f20ad7bc5f" }, "LuaSnip": { "branch": "master", "commit": "45db5addf8d0a201e1cf247cae4cdce605ad3768" },
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" }, "cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
"cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" }, "cmp-dotenv": { "branch": "main", "commit": "4dd53aab60982f1f75848aec5e6214986263325e" },
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
"fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" }, "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" },
"git-blame.nvim": { "branch": "master", "commit": "408d5487d908dfe5d48e5645d8b27ddcc16b11e0" }, "fidget.nvim": { "branch": "main", "commit": "d855eed8a06531a7e8fd0684889b2943f373c469" },
"gruvbox.nvim": { "branch": "main", "commit": "d4cde3853a172485961b515c36d51d757728d6e6" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
"git-blame.nvim": { "branch": "master", "commit": "50543e3993f4b996eea01ff5ccc8fe2a354c5388" },
"gruvbox.nvim": { "branch": "main", "commit": "7a1b23e4edf73a39642e77508ee6b9cbb8c60f9e" },
"harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" },
"indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, "hererocks": { "branch": "master", "commit": "8bd2fcfdd65cfa7535ce39ea372a63b0bdb8e528" },
"lazy.nvim": { "branch": "main", "commit": "70f2c090d3ffb14f8702d468e05beb240b768881" }, "icon-picker.nvim": { "branch": "master", "commit": "3ee9a0ea9feeef08ae35e40c8be6a2fa2c20f2d3" },
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" }, "indent-blankline.nvim": { "branch": "master", "commit": "18603eb949eba08300799f64027af11ef922283f" },
"mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" }, "lazy.nvim": { "branch": "main", "commit": "48b52b5cfcf8f88ed0aff8fde573a5cc20b1306d" },
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" }, "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" },
"neodev.nvim": { "branch": "main", "commit": "02893eeb9d6e8503817bd52385e111cba9a90500" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" },
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
"nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" },
"nvim-autopairs": { "branch": "master", "commit": "fd2badc24e675f947162a16c124d395bde80dbd6" },
"nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" },
"nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" }, "nvim-colorizer.lua": { "branch": "master", "commit": "a065833f35a3a7cc3ef137ac88b5381da2ba302e" },
"nvim-lspconfig": { "branch": "master", "commit": "92166b89ab4b3d60f24e58170cac53b7141fd032" }, "nvim-lspconfig": { "branch": "master", "commit": "bdbc65aadc708ce528efb22bca5f82a7cca6b54d" },
"nvim-surround": { "branch": "main", "commit": "f1f0699a1d49f28e607ffa4361f1bbe757ac5ebc" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" },
"nvim-treesitter": { "branch": "master", "commit": "3a74b5831058d0daf8952a5b8c556c61b30a3f46" }, "nvim-sops": { "branch": "main", "commit": "cb2209562d00ef8c6c88bdec836d9edb8fbb96ef" },
"nvim-web-devicons": { "branch": "master", "commit": "b77921fdc44833c994fdb389d658ccbce5490c16" }, "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" },
"plenary": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "nvim-treesitter": { "branch": "master", "commit": "00f128dd73086aa578dc3d9142de06c633b7c685" },
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" }, "nvim-web-devicons": { "branch": "master", "commit": "9793801f974bba70e4ac5d7eae6c4f5659993d8e" },
"oil.nvim": { "branch": "master", "commit": "1fe476daf0b3c108cb8ee1fc1226cc282fa2c9c1" },
"plenary": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
"plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" },
"search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" }, "search.nvim": { "branch": "main", "commit": "7b8f2315d031be73e14bc2d82386dfac15952614" },
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" }, "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" },
"trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" },
"undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" }, "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
"vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" }, "vim-be-good": { "branch": "master", "commit": "4fa57b7957715c91326fcead58c1fa898b9b3625" },
"vim-fugitive": { "branch": "master", "commit": "4f59455d2388e113bd510e85b310d15b9228ca0d" }, "vim-fugitive": { "branch": "master", "commit": "d4877e54cef67f5af4f950935b1ade19ed6b7370" },
"vim-gitgutter": { "branch": "main", "commit": "e801371917e52805a4ceb1e93f55ed1fba712f82" } "vim-gitgutter": { "branch": "main", "commit": "7b0b5098e3e57be86bb96cfbf2b8902381eef57c" },
"vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }
} }

49
lua/crentist/autocmd.lua Normal file
View File

@@ -0,0 +1,49 @@
local autocmd = vim.api.nvim_create_autocmd
local augroup = vim.api.nvim_create_augroup
local CrentistGroup = augroup('Crentist', {})
local OnSaveGroup = augroup('CrentistOnSave', {})
autocmd('LspAttach', {
group = CrentistGroup,
callback = function(e)
local opts = { buffer = e.buf }
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<M-F>", "<cmd>lua vim.lsp.buf.format()<CR>")
end
})
-- Add new line to the end of the file
autocmd({ "BufWritePre" }, {
group = OnSaveGroup,
pattern = '*',
callback = function()
local n_lines = vim.api.nvim_buf_line_count(0)
local last_nonblank = vim.fn.prevnonblank(n_lines)
if last_nonblank <= n_lines then
vim.api.nvim_buf_set_lines(0,
last_nonblank, n_lines, true, { '' })
end
end,
})
-- Remove trailing spaces
autocmd({ "BufWritePre" }, {
group = OnSaveGroup,
pattern = { "*" },
callback = function()
local save_cursor = vim.fn.winsaveview()
pcall(function() vim.cmd [[%s/\s\+$//e]] end)
vim.fn.winrestview(save_cursor)
end,
})

12
lua/crentist/filetype.lua Normal file
View File

@@ -0,0 +1,12 @@
vim.filetype.add({
extension = {
["tf"] = "terraform",
},
pattern = {
[".*/playbooks/.*%.ya?ml"] = "yaml.ansible",
[".*/roles/.*%.ya?ml"] = "yaml.ansible",
[".*/tasks/.*%.ya?ml"] = "yaml.ansible",
[".*/plays/.*%.ya?ml"] = "yaml.ansible",
},
})

View File

@@ -1,25 +1,6 @@
require("crentist.remap") require("crentist.remap")
require("crentist.set") require("crentist.set")
require("crentist.autocmd")
require("crentist.lazy_init") require("crentist.lazy_init")
require("crentist.filetype")
local augroup = vim.api.nvim_create_augroup
local CrentistGroup = augroup('Crentist', {})
local autocmd = vim.api.nvim_create_autocmd
autocmd('LspAttach', {
group = CrentistGroup,
callback = function(e)
local opts = { buffer = e.buf }
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
vim.keymap.set("n", "<M-F>", "<cmd>lua vim.lsp.buf.format()<CR>")
end
})

View File

@@ -3,7 +3,11 @@ return {
"ellisonleao/gruvbox.nvim", "ellisonleao/gruvbox.nvim",
priority = 1000, priority = 1000,
config = function() config = function()
require("gruvbox").setup({}) require("gruvbox").setup({
italic = {
strings = false,
}
})
vim.cmd("colorscheme gruvbox") vim.cmd("colorscheme gruvbox")
end end
}, },

View File

@@ -0,0 +1,4 @@
return {
'stevearc/dressing.nvim',
opts = {},
}

View File

@@ -7,8 +7,28 @@ return {
harpoon:setup() harpoon:setup()
-- basic telescope configuration
local conf = require("telescope.config").values
local function toggle_telescope(harpoon_files)
local file_paths = {}
for _, item in ipairs(harpoon_files.items) do
table.insert(file_paths, item.value)
end
require("telescope.pickers").new({}, {
prompt_title = "Harpoon",
finder = require("telescope.finders").new_table({
results = file_paths,
}),
previewer = conf.file_previewer({}),
sorter = conf.generic_sorter({}),
}):find()
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,
{ 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)
@@ -16,3 +36,4 @@ return {
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
} }

View File

@@ -0,0 +1,12 @@
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
}

View File

@@ -1,32 +1,55 @@
return { return {
"neovim/nvim-lspconfig", 'neovim/nvim-lspconfig',
dependencies = { dependencies = {
"williamboman/mason.nvim", 'williamboman/mason.nvim',
"williamboman/mason-lspconfig.nvim", 'williamboman/mason-lspconfig.nvim',
"hrsh7th/cmp-nvim-lsp", 'hrsh7th/nvim-cmp',
"hrsh7th/cmp-buffer", 'hrsh7th/cmp-nvim-lsp',
"hrsh7th/cmp-path", 'hrsh7th/cmp-buffer',
"SergioRibera/cmp-dotenv", 'hrsh7th/cmp-path',
"hrsh7th/cmp-cmdline", 'SergioRibera/cmp-dotenv',
"hrsh7th/nvim-cmp", 'hrsh7th/cmp-cmdline',
"L3MON4D3/LuaSnip", 'saadparwaiz1/cmp_luasnip',
"saadparwaiz1/cmp_luasnip", 'L3MON4D3/LuaSnip',
"j-hui/fidget.nvim", 'j-hui/fidget.nvim',
'rafamadriz/friendly-snippets',
{ 'towolf/vim-helm', ft = 'helm' },
}, },
config = function() config = function()
local cmp = require('cmp') local lspconfig = require('lspconfig')
local luasnip = require("luasnip")
require("fidget").setup({}) local cmp = require('cmp')
local luasnip = require('luasnip')
-- load snippets from friendly-snippets
require('luasnip.loaders.from_vscode').lazy_load()
require('fidget').setup({})
require('mason').setup({}) require('mason').setup({})
require('mason-lspconfig').setup({ require('mason-lspconfig').setup({
-- 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 = { 'tsserver', 'lua_ls', 'gopls', 'pylsp', 'gitlab_ci_ls', 'yamlls' }, ensure_installed = {
'tsserver',
'lua_ls',
'gopls',
'pylsp',
'gitlab_ci_ls',
'yamlls',
'ansiblels',
'terraformls',
'helm_ls'
},
handlers = { handlers = {
function(server_name) function(server_name)
require('lspconfig')[server_name].setup({}) if server_name == 'tsserver' then
server_name = 'ts_ls'
end
local capabilities = require('cmp_nvim_lsp').default_capabilities()
require('lspconfig')[server_name].setup({
capabilities = capabilities
})
end, end,
} }
}) })
@@ -34,27 +57,23 @@ return {
sources = { sources = {
{ name = 'path' }, { name = 'path' },
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'dotenv' },
{ name = 'luasnip', keyword_length = 2 }, { name = 'luasnip', keyword_length = 2 },
{ name = 'buffer', keyword_length = 3 }, { name = 'buffer', keyword_length = 3 },
}, },
mapping = cmp.mapping.preset.insert({ mapping = cmp.mapping.preset.insert({
-- `Enter` key to confirm completion -- `Enter` key to confirm completion
['<CR>'] = cmp.mapping(function(fallback) ['<CR>'] = cmp.mapping({
if cmp.visible() then i = function(fallback)
if luasnip.expandable() then if cmp.visible() and cmp.get_active_entry() then
luasnip.expand() cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })
else
cmp.confirm({
select = true,
})
end
else else
fallback() fallback()
end end
end), end,
s = cmp.mapping.confirm({ select = true }),
["<Tab>"] = cmp.mapping(function(fallback) c = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }),
}),
['<Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_next_item() cmp.select_next_item()
elseif luasnip.locally_jumpable(1) then elseif luasnip.locally_jumpable(1) then
@@ -62,9 +81,9 @@ return {
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { 'i', 's' }),
["<S-Tab>"] = cmp.mapping(function(fallback) ['<S-Tab>'] = cmp.mapping(function(fallback)
if cmp.visible() then if cmp.visible() then
cmp.select_prev_item() cmp.select_prev_item()
elseif luasnip.locally_jumpable(-1) then elseif luasnip.locally_jumpable(-1) then
@@ -72,7 +91,7 @@ return {
else else
fallback() fallback()
end end
end, { "i", "s" }), end, { 'i', 's' }),
-- Ctrl+Space to trigger completion menu -- Ctrl+Space to trigger completion menu
['<C-Space>'] = cmp.mapping.complete(), ['<C-Space>'] = cmp.mapping.complete(),
@@ -88,5 +107,65 @@ return {
}, },
}) })
local pythonLineLength = 95
lspconfig.pylsp.setup {
settings = {
pylsp = {
plugins = {
pycodestyle = {
ignore = { 'W391' },
maxLineLength = pythonLineLength
}
}
}
}
}
lspconfig.ansiblels.setup {}
lspconfig.lua_ls.setup {
on_init = function(client)
local path = client.workspace_folders[1].name
if vim.loop.fs_stat(path .. '/.luarc.json') or vim.loop.fs_stat(path .. '/.luarc.jsonc') then
return
end
client.config.settings.Lua = vim.tbl_deep_extend('force', client.config.settings.Lua, {
runtime = {
-- Tell the language server which version of Lua you're using
-- (most likely LuaJIT in the case of Neovim)
version = 'LuaJIT'
},
-- Make the server aware of Neovim runtime files
workspace = {
checkThirdParty = false,
library = {
vim.env.VIMRUNTIME
-- Depending on the usage, you might want to add additional paths here.
-- '${3rd}/luv/library'
-- '${3rd}/busted/library',
}
-- or pull in all of 'runtimepath'. NOTE: this is a lot slower
-- library = vim.api.nvim_get_runtime_file('', true)
}
})
end,
settings = {
Lua = {}
}
}
lspconfig.helm_ls.setup {
settings = {
['helm-ls'] = {
yamlls = {
path = 'yaml-language-server',
}
}
}
}
lspconfig.terraformls.setup {
filetypes = { 'terraform', 'terraform-vars', 'tf' }
}
end end
} }

View File

@@ -1,6 +1,9 @@
return { return {
'nvim-lualine/lualine.nvim', 'nvim-lualine/lualine.nvim',
dependencies = { 'nvim-tree/nvim-web-devicons', branch = 'master' }, dependencies = {
{ 'nvim-tree/nvim-web-devicons', branch = 'master', },
'SmiteshP/nvim-navic',
},
config = function() config = function()
local colors = { local colors = {
black = '#282828', black = '#282828',
@@ -51,16 +54,16 @@ return {
}, },
sections = { sections = {
lualine_c = { lualine_c = {
{
'filename', 'filename',
function() path = 4,
return require("nvim-treesitter").statusline({ },
indicator_size = 70, {
type_patterns = { "class", "function", "method" }, 'navic',
separator = " -> ", },
})
end,
} }
} }
}) })
end end
} }

View File

@@ -0,0 +1,15 @@
return {
'SmiteshP/nvim-navic',
dependencies = {
'neovim/nvim-lspconfig'
},
config = function ()
local navic = require('nvim-navic')
navic.setup({
lsp = {
auto_attach = true
}
})
end
}

17
lua/crentist/lazy/oil.lua Normal file
View File

@@ -0,0 +1,17 @@
return {
'stevearc/oil.nvim',
-- Optional dependencies
dependencies = { 'nvim-tree/nvim-web-devicons' },
opts = {},
config = function()
require('oil').setup({
view_options = {
show_hidden = true,
},
keymaps = {
['<C-h>'] = false,
}
})
end
}

View File

@@ -0,0 +1,13 @@
return {
'lucidph3nx/nvim-sops',
event = { 'BufEnter' },
opts = {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
},
keys = {
{ '<leader>ef', vim.cmd.SopsEncrypt, desc = '[E]ncrypt [F]ile' },
{ '<leader>df', vim.cmd.SopsDecrypt, desc = '[D]ecrypt [F]ile' },
},
}

View File

@@ -1,14 +1,35 @@
return { return {
"FabianWirth/search.nvim", 'FabianWirth/search.nvim',
dependencies = { dependencies = {
"nvim-lua/plenary.nvim", 'nvim-lua/plenary.nvim',
"nvim-telescope/telescope.nvim", 'nvim-telescope/telescope.nvim',
}, },
version = "0.1.6", version = '0.1.6',
config = function() config = function()
require('telescope').setup({}) local telescope = require('telescope')
local telescopeConfig = require('telescope.config')
local vimgrep_arguments = { unpack(telescopeConfig.values.vimgrep_arguments) }
table.insert(vimgrep_arguments, '--hidden')
table.insert(vimgrep_arguments, '--glob')
table.insert(vimgrep_arguments, '!**/.git/*')
telescope.setup({
defaults = {
vimgrep_arguments = vimgrep_arguments,
file_ignore_patterns = {
'node_modules',
}
},
pickers = {
find_files = {
find_command = { 'rg', '--files', '--hidden', '--glob', '!**/.git/*' },
}
}
})
local search = require('search') local search = require('search')
local builtin = require('telescope.builtin') local builtin = require('telescope.builtin')
@@ -17,9 +38,14 @@ return {
next = '<Tab>', next = '<Tab>',
prev = '<S-Tab>' prev = '<S-Tab>'
}, },
tabs = {
{ name = 'Files', tele_func = builtin.find_files, tele_opts = { no_ignore = true, hidden = true } },
{ name = 'Grep', tele_func = builtin.live_grep },
{ name = 'Buffers', tele_func = builtin.buffers },
},
append_tabs = { -- append_tabs will add the provided tabs to the default ones append_tabs = { -- append_tabs will add the provided tabs to the default ones
{ {
'Commits', -- or name = "Commits" 'Commits', -- or name = 'Commits'
builtin.git_commits, -- or tele_func = require('telescope.builtin').git_commits builtin.git_commits, -- or tele_func = require('telescope.builtin').git_commits
available = function() -- optional available = function() -- optional
return vim.fn.isdirectory('.git') == 1 return vim.fn.isdirectory('.git') == 1
@@ -29,17 +55,21 @@ return {
}) })
vim.keymap.set('n', '<leader>pf', search.open, {}) vim.keymap.set('n', '<leader>pf', search.open, {})
vim.keymap.set('n', '<leader>pb', function()
search.open({ tab_name = 'Buffers' })
end)
vim.keymap.set('n', '<leader>pws', function() vim.keymap.set('n', '<leader>pws', function()
local word = vim.fn.expand("<cword>") local word = vim.fn.expand('<cword>')
builtin.grep_string({ search = word }) builtin.grep_string({ search = word })
end) end)
vim.keymap.set('n', '<leader>pWs', function() vim.keymap.set('n', '<leader>pWs', function()
local word = vim.fn.expand("<cWORD>") local word = vim.fn.expand('<cWORD>')
builtin.grep_string({ search = word }) builtin.grep_string({ search = word })
end) end)
vim.keymap.set('n', '<leader>ps', function() vim.keymap.set('n', '<leader>ps', function()
builtin.grep_string({ search = vim.fn.input("Grep > ") }) builtin.grep_string({ search = vim.fn.input('Grep > ') })
end) end)
vim.keymap.set('n', '<leader>vh', builtin.help_tags, {}) vim.keymap.set('n', '<leader>vh', builtin.help_tags, {})
end end
} }

View File

@@ -0,0 +1,37 @@
return {
"folke/trouble.nvim",
opts = {}, -- for default options, refer to the configuration section for custom setup.
cmd = "Trouble",
keys = {
{
"<leader>tt",
"<cmd>Trouble diagnostics toggle<cr>",
desc = "Diagnostics (Trouble)",
},
{
"<leader>tT",
"<cmd>Trouble diagnostics toggle filter.buf=0<cr>",
desc = "Buffer Diagnostics (Trouble)",
},
{
"<leader>ts",
"<cmd>Trouble symbols toggle focus=false<cr>",
desc = "Symbols (Trouble)",
},
{
"<leader>tl",
"<cmd>Trouble lsp toggle focus=false win.position=right<cr>",
desc = "LSP Definitions / references / ... (Trouble)",
},
{
"<leader>tL",
"<cmd>Trouble loclist toggle<cr>",
desc = "Location List (Trouble)",
},
{
"<leader>tQ",
"<cmd>Trouble qflist toggle<cr>",
desc = "Quickfix List (Trouble)",
},
},
}

View File

@@ -1,5 +1,8 @@
vim.g.mapleader = " " vim.g.mapleader = " "
vim.keymap.set("n", "<leader>pv", vim.cmd.Ex) vim.keymap.set("n", "<leader>pv", ":Oil .<CR>")
vim.keymap.set("n", "<C-d>", "<C-d>zz")
vim.keymap.set("n", "<C-u>", "<C-u>zz")
-- 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")
@@ -24,3 +27,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", "<C-s>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")