Compare commits

...

4 Commits

Author SHA1 Message Date
Heiko Blobner 002bebba41 nvim: quickscope 2 years ago
Heiko Blobner 7071c2c983 nvim: lsp-zero-cfg warn removed 2 years ago
Heiko Blobner e075b9fac3 nvim: neocomposer keymap fixed 2 years ago
Heiko Blobner 70b8952fb1 nvim: indent-blankline v2 -> v3 2 years ago
  1. 39
      dot_files/.config/nvim/lua/core/plugins/coding/lsp-zero.lua
  2. 76
      dot_files/.config/nvim/lua/core/plugins/editor/neocomposer.lua
  3. 3
      dot_files/.config/nvim/lua/core/plugins/editor/quick-scope.lua
  4. 3
      dot_files/.config/nvim/lua/core/plugins/ui/indent-blankline.lua

39
dot_files/.config/nvim/lua/core/plugins/coding/lsp-zero.lua

@ -1,7 +1,7 @@
-- lsp-zero -- lsp-zero
return { return {
'VonHeikemen/lsp-zero.nvim', 'VonHeikemen/lsp-zero.nvim',
branch = 'v2.x', branch = 'v3.x',
dependencies = { dependencies = {
-- LSP Support -- LSP Support
{ {
@ -47,6 +47,9 @@ return {
{'rafamadriz/friendly-snippets'}, -- external collection of snippets {'rafamadriz/friendly-snippets'}, -- external collection of snippets
}, },
config = function(_, opts) config = function(_, opts)
local lsp = require('lsp-zero')
lsp.extend_lspconfig()
require("mason").setup() require("mason").setup()
require("mason-lspconfig").setup() require("mason-lspconfig").setup()
require("mason-lspconfig").setup_handlers { require("mason-lspconfig").setup_handlers {
@ -63,7 +66,7 @@ return {
end, end,
} }
local lsp = require('lsp-zero').preset({}) lsp.preset({})
lsp.on_attach(function(_, bufnr) lsp.on_attach(function(_, bufnr)
lsp.default_keymaps({buffer = bufnr}) lsp.default_keymaps({buffer = bufnr})
@ -72,30 +75,6 @@ return {
-- (Optional) Configure lua language server for neovim -- (Optional) Configure lua language server for neovim
require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls()) require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls())
--lsp.ensure_installed({
-- 'ansiblels',
-- 'bashls',
-- 'cairols',
-- 'clangd',
-- 'cmake',
-- 'cssmodules_ls',
-- 'diagnosticls',
-- 'dockerls',
-- 'docker_compose_language_service',
-- 'html',
-- 'java-language-server',
-- 'jedi-language-server',
-- 'jsonls',
-- 'kotlin-language-server',
-- 'marksman',
-- 'metals',
-- 'ruby_ls',
-- 'rust_analyzer',
-- 'yamlls',
-- 'prettierd'
--})
lsp.setup() lsp.setup()
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
@ -104,11 +83,11 @@ return {
local Util = require("core.util") local Util = require("core.util")
-- setup autoformat -- setup autoformat
require("core.plugins.coding.lsp.format").setup(opts) --require("core.plugins.coding.lsp.format").setup(opts)
-- setup formatting and keymaps -- setup formatting and keymaps
Util.on_attach(function(client, buffer) --Util.on_attach(function(client, buffer)
require("core.plugins.coding.lsp.keymaps").on_attach(client, buffer) --require("core.plugins.coding.lsp.keymaps").on_attach(client, buffer)
end) --end)
local cmp = require('cmp') local cmp = require('cmp')
local cmp_action = require('lsp-zero').cmp_action() local cmp_action = require('lsp-zero').cmp_action()

76
dot_files/.config/nvim/lua/core/plugins/editor/neocomposer.lua

@ -1,44 +1,44 @@
-- NeoComposer is a Neovim plugin that streamlines macro management and execution with a -- NeoComposer is a Neovim plugin that streamlines macro management and execution with a
-- customizable Status Line Component and Telescope Extension -- customizable Status Line Component and Telescope Extension
return { return {
{ {
"ecthelionvi/NeoComposer.nvim", "ecthelionvi/NeoComposer.nvim",
dependencies = { dependencies = {
"kkharji/sqlite.lua", "kkharji/sqlite.lua",
},
opts = {
notify = true,
delay_timer = 150,
colors = {
bg = "#16161e",
fg = "#ff9e64",
red = "#ec5f67",
blue = "#5fb3b3",
green = "#99c794",
},
keymaps = {
play_macro = "Q",
yank_macro = "yq",
stop_macro = "cq",
toggle_record = "q",
cycle_next = "<m-n>",
cycle_prev = "<m-p>",
toggle_macro_menu = "<m-q>",
},
},
config = function(_, opts)
require('telescope').load_extension('macros')
require("NeoComposer").setup(opts)
end,
},
{
"nvim-lualine/lualine.nvim",
opts = {
sections = {
lualine_c = {
-- { require('NeoComposer.ui').status_recording },
}, },
}, opts = {
notify = true,
delay_timer = 200,
colors = {
bg = "#16161e",
fg = "#ff9e64",
red = "#ec5f67",
blue = "#5fb3b3",
green = "#99c794",
},
keymaps = {
toggle_play_macro = "Q",
yank_macro = "yq",
stop_macro = "cq",
toggle_record = "q",
cycle_next = "<m-n>",
cycle_prev = "<m-p>",
toggle_macro_menu = "<m-q>",
},
},
config = function(_, opts)
require('telescope').load_extension('macros')
require("NeoComposer").setup(opts)
end,
}, },
} {
"nvim-lualine/lualine.nvim",
opts = {
sections = {
lualine_c = {
-- { require('NeoComposer.ui').status_recording },
},
},
},
}
} }

3
dot_files/.config/nvim/lua/core/plugins/editor/quick-scope.lua

@ -1,4 +1,5 @@
-- An always-on highlight for a unique character in every word on a line to help you use f, F and family. -- An always-on highlight for a unique character in every word on a line to help you use f, F and family.
return { return {
'unblevable/quick-scope', 'unblevable/quick-scope',
cond = not vim.g.vscode
} }

3
dot_files/.config/nvim/lua/core/plugins/ui/indent-blankline.lua

@ -23,6 +23,9 @@ return {
show_current_context = false, show_current_context = false,
show_current_context_start = true, show_current_context_start = true,
}, },
config = function(_, opts)
require("ibl").setup { indent = { highlight = highlight } }
end,
init = function() init = function()
vim.opt.list = true vim.opt.list = true
vim.opt.listchars:append "space:⋅" vim.opt.listchars:append "space:⋅"

Loading…
Cancel
Save