From 59bd3aeee04b6ff559c51a324234a5100db0b2e1 Mon Sep 17 00:00:00 2001 From: Nanderty Date: Mon, 13 Mar 2023 14:05:27 +0100 Subject: new plugins --- after/ftplugin/tex/vimtex.lua | 5 +++++ init.lua | 4 ++-- lua/Nanderty/+ | 10 ---------- lua/Nanderty/Plugins/cmp.lua | 32 +++++++++++++++++++++++++++----- lua/Nanderty/Plugins/mini.lua | 7 +++++++ lua/Nanderty/Plugins/neoformat.lua | 3 +++ lua/Nanderty/Plugins/startify.lua | 0 lua/Nanderty/Plugins/treesitter.lua | 3 --- lua/Nanderty/Plugins/vimtex.lua | 5 ----- lua/Nanderty/general.lua | 7 +++++-- lua/Nanderty/plug.lua | 5 +++-- plugged/mason.nvim | 2 +- plugged/mini.nvim | 1 + plugged/neoformat | 1 + plugged/nvim-treesitter | 2 +- plugged/nvim-web-devicons | 2 +- plugged/vim-startify | 1 - 17 files changed, 57 insertions(+), 33 deletions(-) create mode 100644 after/ftplugin/tex/vimtex.lua delete mode 100644 lua/Nanderty/+ create mode 100644 lua/Nanderty/Plugins/mini.lua create mode 100644 lua/Nanderty/Plugins/neoformat.lua delete mode 100644 lua/Nanderty/Plugins/startify.lua delete mode 100644 lua/Nanderty/Plugins/vimtex.lua create mode 160000 plugged/mini.nvim create mode 160000 plugged/neoformat delete mode 160000 plugged/vim-startify diff --git a/after/ftplugin/tex/vimtex.lua b/after/ftplugin/tex/vimtex.lua new file mode 100644 index 0000000..774d3eb --- /dev/null +++ b/after/ftplugin/tex/vimtex.lua @@ -0,0 +1,5 @@ +vim.g.tex_flavor='latex' + +vim.g.vimtex_quickfix_open_on_warning = 0 + +vim.keymap.set('n', 'll', 'VimtexCompile', {} ) diff --git a/init.lua b/init.lua index dfdd0bb..9856c8b 100644 --- a/init.lua +++ b/init.lua @@ -5,8 +5,8 @@ require('Nanderty.remap') require('Nanderty.Plugins.lualine') require('Nanderty.Plugins.telescope') -require('Nanderty.Plugins.vimtex') require('Nanderty.Plugins.bufferline') -require('Nanderty.Plugins.startify') +require('Nanderty.Plugins.mini') require('Nanderty.Plugins.cmp') require('Nanderty.Plugins.treesitter') +require('Nanderty.Plugins.neoformat') diff --git a/lua/Nanderty/+ b/lua/Nanderty/+ deleted file mode 100644 index a138f4b..0000000 --- a/lua/Nanderty/+ +++ /dev/null @@ -1,10 +0,0 @@ -require('Nanderty.plug') - -require('Nanderty.general') -require('Nanderty.remap') - -require('Nanderty.Plugins.lualine') -require('Nanderty.Plugins.telescope') -require('Nanderty.Plugins.vimtex') -require('Nanderty.Plugins.bufferline') -require('Nanderty.Plugins.startify') diff --git a/lua/Nanderty/Plugins/cmp.lua b/lua/Nanderty/Plugins/cmp.lua index 2c73b05..b9f2095 100644 --- a/lua/Nanderty/Plugins/cmp.lua +++ b/lua/Nanderty/Plugins/cmp.lua @@ -30,11 +30,33 @@ cmp.setup({ window = { }, mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - [''] = cmp.mapping.complete(), - [''] = cmp.mapping.abort(), - [''] = cmp.mapping.confirm({ select = true }), + [""] = 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' }, diff --git a/lua/Nanderty/Plugins/mini.lua b/lua/Nanderty/Plugins/mini.lua new file mode 100644 index 0000000..0546fe3 --- /dev/null +++ b/lua/Nanderty/Plugins/mini.lua @@ -0,0 +1,7 @@ +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 new file mode 100644 index 0000000..54ed27d --- /dev/null +++ b/lua/Nanderty/Plugins/neoformat.lua @@ -0,0 +1,3 @@ +vim.api.nvim_create_autocmd("BufWritePre", { +command = "Neoformat" +}) diff --git a/lua/Nanderty/Plugins/startify.lua b/lua/Nanderty/Plugins/startify.lua deleted file mode 100644 index e69de29..0000000 diff --git a/lua/Nanderty/Plugins/treesitter.lua b/lua/Nanderty/Plugins/treesitter.lua index 7baec80..2eef668 100644 --- a/lua/Nanderty/Plugins/treesitter.lua +++ b/lua/Nanderty/Plugins/treesitter.lua @@ -3,9 +3,6 @@ require'nvim-treesitter.configs'.setup { sync_install = false, - auto_install = true, - - highlight = { enable = true, diff --git a/lua/Nanderty/Plugins/vimtex.lua b/lua/Nanderty/Plugins/vimtex.lua deleted file mode 100644 index 511c2bf..0000000 --- a/lua/Nanderty/Plugins/vimtex.lua +++ /dev/null @@ -1,5 +0,0 @@ -vim.g.tex_flavor='latex' -vim.g.vimtex_view_mehtod = 'mupdf' -vim.g.vimtex_quickfix_open_on_warning = 0 - -vim.keymap.set('n', 'll', 'VimtexCompile', {} ) diff --git a/lua/Nanderty/general.lua b/lua/Nanderty/general.lua index c051876..36f6519 100644 --- a/lua/Nanderty/general.lua +++ b/lua/Nanderty/general.lua @@ -2,13 +2,16 @@ vim.opt.spelllang = {'de_de', 'en_us'} vim.opt.timeoutlen = 500 vim.opt.updatetime = 200 -vim.opt.clipboard = 'unnamedplus' vim.opt.mouse = a vim.opt.signcolumn = 'yes' vim.opt.cursorline = true +vim.opt.undofile = true +vim.opt.undodir = { vim.fn.stdpath('data')..'/undo' } +vim.opt.undolevels = 1000 + vim.opt.number = true -vim.opt.scrolloff = 30 +vim.opt.scrolloff = 20 vim.opt.numberwidth = 5 vim.opt.termguicolors = true diff --git a/lua/Nanderty/plug.lua b/lua/Nanderty/plug.lua index 5129494..4bb4b5e 100644 --- a/lua/Nanderty/plug.lua +++ b/lua/Nanderty/plug.lua @@ -1,7 +1,8 @@ local Plug = vim.fn['plug#'] vim.call("plug#begin", "~/AppData/local/nvim/plugged") -Plug 'mhinz/vim-startify' +Plug 'echasnovski/mini.nvim' + Plug 'tpope/vim-fugitive' Plug 'nvim-lua/plenary.nvim' Plug('nvim-telescope/telescope.nvim', {branch = '0.1.x'}) @@ -14,7 +15,7 @@ Plug 'navarasu/onedark.nvim' Plug('nvim-treesitter/nvim-treesitter', {run = ':TSUpdate'}) Plug 'lervag/vimtex' - +Plug 'sbdchd/neoformat' Plug 'neovim/nvim-lspconfig' Plug 'williamboman/mason.nvim' Plug 'williamboman/mason-lspconfig.nvim' diff --git a/plugged/mason.nvim b/plugged/mason.nvim index 698cd0c..10ff879 160000 --- a/plugged/mason.nvim +++ b/plugged/mason.nvim @@ -1 +1 @@ -Subproject commit 698cd0c4f10480991e665f31977650858d625af1 +Subproject commit 10ff879fc56160e10437da5c1ca558371ddb6989 diff --git a/plugged/mini.nvim b/plugged/mini.nvim new file mode 160000 index 0000000..1adfdeb --- /dev/null +++ b/plugged/mini.nvim @@ -0,0 +1 @@ +Subproject commit 1adfdeb899df23fe740fc8596e6513445f8042bc diff --git a/plugged/neoformat b/plugged/neoformat new file mode 160000 index 0000000..891fad5 --- /dev/null +++ b/plugged/neoformat @@ -0,0 +1 @@ +Subproject commit 891fad5829f91cbc3d0866f7abd028d233b8763e diff --git a/plugged/nvim-treesitter b/plugged/nvim-treesitter index a6cc614..834f1dc 160000 --- a/plugged/nvim-treesitter +++ b/plugged/nvim-treesitter @@ -1 +1 @@ -Subproject commit a6cc614409e5920800d0b5d7bba930a0fe830271 +Subproject commit 834f1dcb8736c82b1269227b4bfe830310b5b6a1 diff --git a/plugged/nvim-web-devicons b/plugged/nvim-web-devicons index 4af94fe..4ee637e 160000 --- a/plugged/nvim-web-devicons +++ b/plugged/nvim-web-devicons @@ -1 +1 @@ -Subproject commit 4af94fec29f508159ceab5413383e5dedd6c24e3 +Subproject commit 4ee637e0b1873efe1e901380f232799fa0764879 diff --git a/plugged/vim-startify b/plugged/vim-startify deleted file mode 160000 index 81e36c3..0000000 --- a/plugged/vim-startify +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 81e36c352a8deea54df5ec1e2f4348685569bed2 -- cgit v1.2.3