replace some more plugins with lua variants

This commit is contained in:
Patrick Michl 2021-11-15 07:47:19 +01:00
parent 6c688b5a55
commit 91912472ea
7 changed files with 105 additions and 14 deletions

View File

@ -1,11 +1,11 @@
require 'plugins' require 'plugins'
vim.cmd('colorscheme space-vim-dark') vim.g.onedark_style = 'warmer'
require('onedark').setup()
require 'lsp' require 'lsp'
require 'completion' require 'completion'
require 'treesitter' require 'treesitter'
require 'debugger'
require 'term' require 'term'
require 'settings' require 'settings'
require 'keys' require 'keys'

View File

@ -40,5 +40,7 @@ cmp.setup {
sources = { sources = {
{ name = 'nvim_lsp' }, { name = 'nvim_lsp' },
{ name = 'luasnip' }, { name = 'luasnip' },
{ name = 'buffer' },
{ name = 'path' },
}, },
} }

View File

@ -2,14 +2,15 @@ local key = vim.api.nvim_set_keymap
local u = require('utils') local u = require('utils')
vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]]) vim.cmd([[autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif]])
vim.cmd([[autocmd BufNewFile,BufRead *.md setlocal filetype=notes]]) vim.cmd([[autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics({focusable = false})]])
vim.cmd([[autocmd CursorHold * lua vim.lsp.diagnostic.show_line_diagnostics()]])
key('n', ';', ':Files<CR>', {}) key('n', ';', ':Telescope find_files<CR>', {})
key('', '<C-n>', ':NERDTreeToggle<CR>', {}) key('', '<C-n>', ':NvimTreeToggle<CR>', {})
key('n', 'gh', '/<c-r>=expand("<cword>")<CR><CR>N', {})
key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', {expr = true, silent = true}) key('i', '<TAB>', 'pumvisible() ? "<C-n>" : "<Tab>"', {expr = true, silent = true})
key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', {expr = true, silent = true}) key('i', '<S-TAB>', 'pumvisible() ? "<C-p>" : "<S-Tab>"', {expr = true, silent = true})
key('n','<leader>g',':lua require"telescope.builtin".live_grep{}<CR>', {})
-- Highlight on yank -- Highlight on yank
vim.api.nvim_exec( vim.api.nvim_exec(

View File

@ -4,15 +4,38 @@ return require('packer').startup({function()
local use = use local use = use
-- Packer can manage itself -- Packer can manage itself
use 'wbthomason/packer.nvim' use 'wbthomason/packer.nvim'
-- Theme
use 'navarasu/onedark.nvim'
-- use 'liuchengxu/space-vim-dark'
use 'vim-airline/vim-airline' use {
'nvim-lualine/lualine.nvim',
requires = {'kyazdani42/nvim-web-devicons', opt = true},
config = function() require('plugins/lualine') end
}
use {
"folke/todo-comments.nvim",
requires = "nvim-lua/plenary.nvim",
config = function() require("todo-comments").setup()end
}
use {
"folke/which-key.nvim",
config = function() require("which-key").setup() end
}
use {
'jremmen/vim-ripgrep',
op = true,
cmd = { 'Rg' }
}
use {
'tpope/vim-dispatch',
opt = true,
cmd = { 'Dispatch', 'Dispatch!' }
}
use 'scrooloose/nerdtree' use 'scrooloose/nerdtree'
use 'Xuyuanp/nerdtree-git-plugin' use 'Xuyuanp/nerdtree-git-plugin'
use 'liuchengxu/space-vim-dark'
use 'tpope/vim-fugitive' use 'tpope/vim-fugitive'
use 'tpope/vim-commentary' use 'tpope/vim-commentary'
use { 'tpope/vim-dispatch', opt = true, cmd = { 'Dispatch', 'Dispatch!' } }
use 'junegunn/fzf.vim'
use 'sheerun/vim-polyglot' use 'sheerun/vim-polyglot'
use 'honza/vim-snippets' use 'honza/vim-snippets'
use 'szw/vim-tags' use 'szw/vim-tags'
@ -21,7 +44,6 @@ return require('packer').startup({function()
use 'tpope/vim-haml' use 'tpope/vim-haml'
use 'xolox/vim-notes' use 'xolox/vim-notes'
use 'xolox/vim-misc' use 'xolox/vim-misc'
use 'jremmen/vim-ripgrep'
use 'airblade/vim-gitgutter' use 'airblade/vim-gitgutter'
use 'akinsho/toggleterm.nvim' use 'akinsho/toggleterm.nvim'
-- LSP Setup -- LSP Setup
@ -30,14 +52,31 @@ return require('packer').startup({function()
use 'nvim-lua/lsp_extensions.nvim' use 'nvim-lua/lsp_extensions.nvim'
use 'nvim-lua/completion-nvim' use 'nvim-lua/completion-nvim'
use 'nvim-lua/popup.nvim' use 'nvim-lua/popup.nvim'
use {
'nvim-telescope/telescope.nvim',
requires = { {'nvim-lua/plenary.nvim'} }
}
use {'nvim-telescope/telescope-fzf-native.nvim', run = 'make' }
use 'nvim-lua/plenary.nvim' use 'nvim-lua/plenary.nvim'
use 'L3MON4D3/LuaSnip' -- Snippets plugin
use 'hrsh7th/nvim-cmp' -- Autocompletion plugin use 'hrsh7th/nvim-cmp' -- Autocompletion plugin
use 'hrsh7th/cmp-nvim-lsp' use 'hrsh7th/cmp-nvim-lsp'
use 'saadparwaiz1/cmp_luasnip' use 'saadparwaiz1/cmp_luasnip'
use 'L3MON4D3/LuaSnip' -- Snippets plugin use "hrsh7th/cmp-buffer"
use "hrsh7th/cmp-path"
use 'nvim-treesitter/nvim-treesitter' use 'nvim-treesitter/nvim-treesitter'
-- Debugger --
use 'mfussenegger/nvim-dap' use 'kyazdani42/nvim-web-devicons'
use {
'kyazdani42/nvim-tree.lua',
cmd = {
'NvimTreeOpen',
'NvimTreeFocus',
'NvimTreeToggle',
},
config = function() require'plugins/nvim-tree' end
}
end, end,
config = { config = {
display = { display = {

14
lua/plugins/lualine.lua Normal file
View File

@ -0,0 +1,14 @@
-- Inserts a component in lualine_c at left section
local config = {}
local function ins_left(component)
table.insert(config.sections.lualine_c, component)
end
-- Inserts a component in lualine_x ot right section
local function ins_right(component)
table.insert(config.sections.lualine_x, component)
end
local config = require('lualine').get_config()
config.options.theme = 'onedark'
require('lualine').setup(config)

33
lua/plugins/nvim-tree.lua Normal file
View File

@ -0,0 +1,33 @@
local tree_cb = require('nvim-tree.config').nvim_tree_callback
require("nvim-tree").setup {
auto_close = true,
view = {
width = "15%",
side = "left",
mappings = {
custom_only = true,
list = {
{ key = {"<CR>", "<2-LeftMouse>"}, cb = tree_cb("edit") },
{ key = "vs", cb = tree_cb("vsplit") },
{ key = "s", cb = tree_cb("split") },
{ key = "t", cb = tree_cb("tabnew") },
{ key = "<Tab>", cb = tree_cb("preview") },
{ key = "K", cb = tree_cb("first_sibling") },
{ key = "J", cb = tree_cb("last_sibling") },
{ key = "R", cb = tree_cb("refresh") },
{ key = "ma", cb = tree_cb("create") },
{ key = "md", cb = tree_cb("remove") },
{ key = "mm", cb = tree_cb("rename") },
{ key = "<C-r>", cb = tree_cb("full_rename") },
{ key = "mc", cb = ':lua require"nvim-tree".on_keypress("copy");require"nvim-tree".on_keypress("paste")<CR>' },
{ key = "?", cb = tree_cb("toggle_help") },
}
}
}
}
-- Hide statusline in nvim-tree buffer/tabs.
-- vim.cmd('au BufEnter,BufWinEnter,WinEnter,CmdwinEnter * if bufname("%") == "NvimTree" | set laststatus=0 | else | set laststatus=2 | endif')

View File

@ -0,0 +1,2 @@
require('telescope').load_extension('fzf')