From fba8830826fa88ef43d84fb051f90f11e4ae939b Mon Sep 17 00:00:00 2001 From: Nanderty Date: Wed, 15 Mar 2023 23:36:14 +0100 Subject: cleanup --- lua/Nanderty/Plugins/bufferline.lua | 2 - lua/Nanderty/Plugins/cmp.lua | 82 ------------------------------------- lua/Nanderty/Plugins/lualine.lua | 5 --- lua/Nanderty/Plugins/mini.lua | 7 ---- lua/Nanderty/Plugins/neoformat.lua | 3 -- lua/Nanderty/Plugins/telescope.lua | 6 --- lua/Nanderty/Plugins/treesitter.lua | 10 ----- lua/Nanderty/plug.lua | 17 ++++---- 8 files changed, 9 insertions(+), 123 deletions(-) delete mode 100644 lua/Nanderty/Plugins/bufferline.lua delete mode 100644 lua/Nanderty/Plugins/cmp.lua delete mode 100644 lua/Nanderty/Plugins/lualine.lua delete mode 100644 lua/Nanderty/Plugins/mini.lua delete mode 100644 lua/Nanderty/Plugins/neoformat.lua delete mode 100644 lua/Nanderty/Plugins/telescope.lua delete mode 100644 lua/Nanderty/Plugins/treesitter.lua (limited to 'lua') diff --git a/lua/Nanderty/Plugins/bufferline.lua b/lua/Nanderty/Plugins/bufferline.lua deleted file mode 100644 index c5accc7..0000000 --- a/lua/Nanderty/Plugins/bufferline.lua +++ /dev/null @@ -1,2 +0,0 @@ -vim.opt.termguicolors = true -require("bufferline").setup{} diff --git a/lua/Nanderty/Plugins/cmp.lua b/lua/Nanderty/Plugins/cmp.lua deleted file mode 100644 index b9f2095..0000000 --- a/lua/Nanderty/Plugins/cmp.lua +++ /dev/null @@ -1,82 +0,0 @@ -require('mason').setup() - -require('mason-lspconfig').setup({ - ensure_installed = { - } -}) - -local lsp_capabilities = require('cmp_nvim_lsp').default_capabilities() -local lsp_attach = function(client, bufnr) -end - -local lspconfig = require('lspconfig') -require('mason-lspconfig').setup_handlers({ - function(server_name) - lspconfig[server_name].setup({ - on_attach = lsp_attach, - capabilities = lsp_capabilities, - }) - end, -}) - -local cmp = require'cmp' - -cmp.setup({ - snippet = { - expand = function(args) - vim.fn["UltiSnips#Anon"](args.body) - end, - }, - window = { - }, - mapping = cmp.mapping.preset.insert({ - [""] = cmp.mapping(function(fallback) - if vim.fn.pumvisible() == 1 then - feedkey("", "n") - elseif cmp.visible() then - cmp.select_next_item() - else - fallback() - end - end, { - "i", - }), - [""] = cmp.mapping(function(fallback) - if vim.fn.pumvisible() == 1 then - feedkey("", "n") - elseif cmp.visible() then - cmp.select_prev_item() - else - fallback() - end - end, { - "i", -}), -[''] = cmp.mapping.scroll_docs(-4), -[''] = cmp.mapping.scroll_docs(4), -[''] = cmp.mapping.complete(), -[''] = cmp.mapping.abort(), -[''] = cmp.mapping.confirm({ select = true }), - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'ultisnips' }, - { name = 'omni' }, - { name = 'buffer' }, - }) -}) - -local lsp_capabilities = require('cmp_nvim_lsp').default_capabilities() -local lsp_attach = function(client, bufnr) - -- Create your keybindings here... -end - -local lspconfig = require('lspconfig') -require('mason-lspconfig').setup_handlers({ - function(server_name) - lspconfig[server_name].setup({ - on_attach = lsp_attach, - capabilities = lsp_capabilities, - }) - end, -}) diff --git a/lua/Nanderty/Plugins/lualine.lua b/lua/Nanderty/Plugins/lualine.lua deleted file mode 100644 index 5ace147..0000000 --- a/lua/Nanderty/Plugins/lualine.lua +++ /dev/null @@ -1,5 +0,0 @@ -require('lualine').setup { - options = { - theme = 'onedark' - } -} diff --git a/lua/Nanderty/Plugins/mini.lua b/lua/Nanderty/Plugins/mini.lua deleted file mode 100644 index 0546fe3..0000000 --- a/lua/Nanderty/Plugins/mini.lua +++ /dev/null @@ -1,7 +0,0 @@ -require('mini.starter').setup({ - evaluate_single = true -}) -require('mini.sessions').setup({ -force = {read = false, write = true, delete = true} -}) -require('mini.fuzzy').setup() diff --git a/lua/Nanderty/Plugins/neoformat.lua b/lua/Nanderty/Plugins/neoformat.lua deleted file mode 100644 index 54ed27d..0000000 --- a/lua/Nanderty/Plugins/neoformat.lua +++ /dev/null @@ -1,3 +0,0 @@ -vim.api.nvim_create_autocmd("BufWritePre", { -command = "Neoformat" -}) diff --git a/lua/Nanderty/Plugins/telescope.lua b/lua/Nanderty/Plugins/telescope.lua deleted file mode 100644 index 4806008..0000000 --- a/lua/Nanderty/Plugins/telescope.lua +++ /dev/null @@ -1,6 +0,0 @@ -local builtin = require('telescope.builtin') -vim.keymap.set('n', 'pf', builtin.find_files, {}) -vim.keymap.set('n', '', builtin.git_files, {}) -vim.keymap.set('n', 'ps', function() - builtin.grep_string({ search = vim.fn.input("Grep > ") }); -end) diff --git a/lua/Nanderty/Plugins/treesitter.lua b/lua/Nanderty/Plugins/treesitter.lua deleted file mode 100644 index 2eef668..0000000 --- a/lua/Nanderty/Plugins/treesitter.lua +++ /dev/null @@ -1,10 +0,0 @@ -require'nvim-treesitter.configs'.setup { - ensure_installed = {"help", "javascript", "html", "css", "python", "cpp", "c", "lua", "php",}, - - sync_install = false, - - highlight = { - enable = true, - - }, -} diff --git a/lua/Nanderty/plug.lua b/lua/Nanderty/plug.lua index 4bb4b5e..1c778a0 100644 --- a/lua/Nanderty/plug.lua +++ b/lua/Nanderty/plug.lua @@ -1,21 +1,22 @@ local Plug = vim.fn['plug#'] -vim.call("plug#begin", "~/AppData/local/nvim/plugged") +vim.call('plug#begin', vim.fn.stdpath('data')..'/Plugged') Plug 'echasnovski/mini.nvim' Plug 'tpope/vim-fugitive' +Plug 'ludovicchabant/vim-gutentags' +Plug 'sbdchd/neoformat' +Plug 'neomake/neomake' + Plug 'nvim-lua/plenary.nvim' Plug('nvim-telescope/telescope.nvim', {branch = '0.1.x'}) Plug('akinsho/bufferline.nvim', {tag = 'v3.*'}) Plug 'nvim-lualine/lualine.nvim' Plug 'kyazdani42/nvim-web-devicons' - -Plug 'navarasu/onedark.nvim' - Plug('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) +Plug 'navarasu/onedark.nvim' Plug 'lervag/vimtex' -Plug 'sbdchd/neoformat' Plug 'neovim/nvim-lspconfig' Plug 'williamboman/mason.nvim' Plug 'williamboman/mason-lspconfig.nvim' @@ -26,7 +27,7 @@ Plug 'hrsh7th/cmp-path' Plug 'hrsh7th/cmp-cmdline' Plug 'hrsh7th/nvim-cmp' -Plug 'SirVer/ultisnips' -Plug 'quangnguyen30192/cmp-nvim-ultisnips' +Plug 'L3MON4D3/LuaSnip' +Plug 'saadparwaiz1/cmp_luasnip' -vim.call("plug#end") +vim.call('plug#end') -- cgit v1.2.3