From 3b4799ad455b49c3ec051d0820e8a0dbb9f911b0 Mon Sep 17 00:00:00 2001 From: Nanderty Date: Tue, 21 Mar 2023 22:56:50 +0100 Subject: keybinds --- lua/keymaps.lua | 9 ++- lua/options.lua | 2 + lua/plugins/cmp.lua | 165 +++++++++++++++++++++++----------------------- lua/plugins/general.lua | 72 ++++++++++---------- lua/plugins/telescope.lua | 142 +++++++++++++++++++-------------------- 5 files changed, 198 insertions(+), 192 deletions(-) diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 6596a43..2069a20 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,2 +1,7 @@ -vim.g.mapleader = " " - +vim.keymap.set('v', 'J', ":m '>+1gv=gv") +vim.keymap.set('v', 'K', ":m '<-2gv=gv") +vim.keymap.set("n", "f", vim.lsp.buf.format) +vim.keymap.set("n", "w", 'w') +vim.keymap.set("n", "q", 'qa') +vim.keymap.set("n", "p", [["+p]]) +vim.keymap.set({"n", "v"}, "y", [["+y]]) diff --git a/lua/options.lua b/lua/options.lua index 53fd399..63e9768 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -15,6 +15,8 @@ vim.opt.undolevels = 1000 vim.opt.showmode = false vim.opt.smartindent = true vim.opt.shiftwidth = 4 +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 vim.opt.number = true vim.opt.scrolloff = 20 vim.opt.numberwidth = 5 diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua index 5830b7b..69a1b17 100644 --- a/lua/plugins/cmp.lua +++ b/lua/plugins/cmp.lua @@ -1,89 +1,88 @@ return { - { - 'L3MON4D3/LuaSnip', - dependencies = { - 'iurimateus/luasnip-latex-snippets.nvim', - 'rafamadriz/friendly-snippets', - }, - opts = { - history = true, - delete_check_events = "TextChanged", - }, - config = function() - require('luasnip-latex-snippets').setup() - require('luasnip.loaders.from_vscode').lazy_load() - end - }, - { - 'hrsh7th/nvim-cmp', - event = 'InsertEnter', - dependencies = { - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-buffer', - 'hrsh7th/cmp-path', - 'hrsh7th/cmp-calc', - 'saadparwaiz1/cmp_luasnip', - 'L3MON4D3/LuaSnip', + { + 'L3MON4D3/LuaSnip', + dependencies = { + 'iurimateus/luasnip-latex-snippets.nvim', + 'rafamadriz/friendly-snippets', + }, + opts = { + history = true, + delete_check_events = "TextChanged", + }, + config = function() + require('luasnip-latex-snippets').setup() + require('luasnip.loaders.from_vscode').lazy_load() + end }, - - opts = function() - local has_words_before = function() - unpack = unpack or table.unpack - local line, col = unpack(vim.api.nvim_win_get_cursor(0)) - return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil - end - - local luasnip = require('luasnip') - local cmp = require('cmp') - - luasnip.config.set_config({ - history = true, - enable_autosnippets = true, - }) - return { - snippet = { - expand = function(args) - require('luasnip').lsp_expand(args.body) - end, + { + 'hrsh7th/nvim-cmp', + event = 'InsertEnter', + dependencies = { + 'hrsh7th/cmp-nvim-lsp', + 'hrsh7th/cmp-buffer', + 'hrsh7th/cmp-path', + 'hrsh7th/cmp-calc', + 'saadparwaiz1/cmp_luasnip', + 'L3MON4D3/LuaSnip', }, - mapping = cmp.mapping.preset.insert({ - [''] = cmp.mapping.confirm({ select = false }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_next_item() - elseif luasnip.expand_or_jumpable() then - luasnip.expand_or_jump() - elseif has_words_before() then - cmp.complete() - else - fallback() + opts = function() + local has_words_before = function() + unpack = unpack or table.unpack + local line, col = unpack(vim.api.nvim_win_get_cursor(0)) + return col ~= 0 and + vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match('%s') == nil end - end, { 'i', 's' }), - [''] = cmp.mapping(function(fallback) - if cmp.visible() then - cmp.select_prev_item() - elseif luasnip.jumpable(-1) then - luasnip.jump(-1) - else - fallback() - end - end, { 'i', 's' }), - }), - sources = cmp.config.sources({ - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'buffer' }, - { name = 'path' }, - { name = 'calc' }, - }), - formatting = { - format = function(_, item) - item.kind = (require('icons').kinds[item.kind] or ' ')..item.kind - return item - end - } - } - end, - }, + local luasnip = require('luasnip') + local cmp = require('cmp') + + luasnip.config.set_config({ + history = true, + enable_autosnippets = true, + }) + return { + snippet = { + expand = function(args) + require('luasnip').lsp_expand(args.body) + end, + }, + mapping = cmp.mapping.preset.insert({ + [''] = cmp.mapping.confirm({ select = false }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif has_words_before() then + cmp.complete() + else + fallback() + end + end, { 'i', 's' }), + [''] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { 'i', 's' }), + }), + sources = cmp.config.sources({ + { name = 'nvim_lsp' }, + { name = 'luasnip' }, + { name = 'buffer' }, + { name = 'path' }, + { name = 'calc' }, + }), + formatting = { + format = function(_, item) + item.kind = (require('icons').kinds[item.kind] or ' ') .. item.kind + return item + end + } + } + end, + }, } diff --git a/lua/plugins/general.lua b/lua/plugins/general.lua index d78275e..c188304 100644 --- a/lua/plugins/general.lua +++ b/lua/plugins/general.lua @@ -1,42 +1,42 @@ return { - { - 'sbdchd/neoformat', - keys = { - { 'i', 'Neoformat', desc = 'format' }, + { + 'sbdchd/neoformat', + keys = { + { 'i', 'Neoformat', desc = 'format' }, + }, }, - }, - { - 'neomake/neomake', - event = { - 'BufReadPost', - 'BufNewFile' + { + 'neomake/neomake', + event = { + 'BufReadPost', + 'BufNewFile' + }, + config = function() + vim.call('neomake#configure#automake', 'nrwi', '500') + end, }, - config = function() - vim.call('neomake#configure#automake', 'nrwi', '500') - end, - }, - { - 'tpope/vim-fugitive', - event = { - 'BufReadPost', - 'BufNewFile' + { + 'tpope/vim-fugitive', + event = { + 'BufReadPost', + 'BufNewFile' + }, }, - }, - { - 'ludovicchabant/vim-gutentags', - event = { - 'BufReadPost', - 'BufNewFile' + { + 'ludovicchabant/vim-gutentags', + event = { + 'BufReadPost', + 'BufNewFile' + }, + }, + { + 'max397574/better-escape.nvim', + lazy = false, + config = function() + require('better_escape').setup { + mapping = { 'jk' }, + timeout = 0.2 * vim.o.timeoutlen, + } + end, }, - }, - { - 'max397574/better-escape.nvim', - lazy = false, - config = function() - require('better_escape').setup { - mapping = { 'jk' }, - timeout = 0.2 * vim.o.timeoutlen, - } - end, - }, } diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 949c617..26dc418 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -1,79 +1,79 @@ return { - { - 'nvim-telescope/telescope.nvim', - keys = { - { 'pf', 'Telescope find_files', desc = 'find files' }, - { 'pd', 'Telescope oldfiles', desc = 'find oldfiles' }, - { 'pg', 'Telescope live_grep', desc = 'grep files' }, - { 'pb', 'Telescope buffers', desc = 'find buffers' }, - }, - dependencies = { - 'nvim-lua/plenary.nvim', - 'nvim-tree/nvim-web-devicons', - 'nvim-telescope/telescope-fzf-native.nvim', - }, - opts = { - defaults = { - mappings = { - n = { - ['q'] = function(...) - return require('telescope.actions').close(...) - end, - } + { + 'nvim-telescope/telescope.nvim', + keys = { + { 'pf', 'Telescope find_files', desc = 'find files' }, + { 'pd', 'Telescope oldfiles', desc = 'find oldfiles' }, + { 'pg', 'Telescope live_grep', desc = 'grep files' }, + { 'pb', 'Telescope buffers', desc = 'find buffers' }, }, - layout_config = { - horizontal = { - prompt_position = 'top', - preview_width = 0.55, - results_width = 0.8, - }, - vertical = { - mirror = false, - }, - width = 0.87, - height = 0.80, - preview_cutoff = 120, + dependencies = { + 'nvim-lua/plenary.nvim', + 'nvim-tree/nvim-web-devicons', + 'nvim-telescope/telescope-fzf-native.nvim', + }, + opts = { + defaults = { + mappings = { + n = { + ['q'] = function(...) + return require('telescope.actions').close(...) + end, + } + }, + layout_config = { + horizontal = { + prompt_position = 'top', + preview_width = 0.55, + results_width = 0.8, + }, + vertical = { + mirror = false, + }, + width = 0.87, + height = 0.80, + preview_cutoff = 120, + }, + borderchars = { '█', ' ', '▀', '█', '█', ' ', ' ', '▀' }, + }, + extensions = { + sessions_picker = { + sessions_dir = vim.fn.stdpath('data') .. '/session/', + } + }, }, - borderchars = { '█', ' ', '▀', '█', '█', ' ', ' ', '▀' }, - }, - extensions = { - sessions_picker = { - sessions_dir = vim.fn.stdpath('data') ..'/session/', - } - }, - }, - }, - { - 'nvim-telescope/telescope-file-browser.nvim', - keys = { - { 'pv', 'Telescope file_browser path=%:p:h select_buffer=true', desc = 'file tree' }, }, - dependencies = { - 'nvim-telescope/telescope.nvim', + { + 'nvim-telescope/telescope-file-browser.nvim', + keys = { + { 'pv', 'Telescope file_browser path=%:p:h select_buffer=true', desc = 'file tree' }, + }, + dependencies = { + 'nvim-telescope/telescope.nvim', + }, + config = function() + require('telescope').load_extension 'file_browser' + end, }, - config = function() - require('telescope').load_extension 'file_browser' - end, - }, - { - dir = vim.fn.stdpath('data')..'/localplugins/telemini/', - keys = { - { 'ps', 'Telescope telemini', desc = 'sessions' } + { + dir = vim.fn.stdpath('data') .. '/localplugins/telemini/', + keys = { + { 'ps', 'Telescope telemini', desc = 'sessions' } + }, + dependencies = { + 'nvim-telescope/telescope.nvim', + }, + config = function() + require('telescope').load_extension 'telemini' + end, }, - dependencies = { - 'nvim-telescope/telescope.nvim', + { + 'nvim-telescope/telescope-fzf-native.nvim', + build = 'make', + config = function() + require('telescope').load_extension 'fzf' + end, }, - config = function() - require('telescope').load_extension 'telemini' - end, - }, - { - 'nvim-telescope/telescope-fzf-native.nvim', - build = 'make', - config = function() - require('telescope').load_extension 'fzf' - end, - }, - { 'nvim-tree/nvim-web-devicons',}, - { 'nvim-lua/plenary.nvim',}, + { 'nvim-tree/nvim-web-devicons', }, + { 'nvim-lua/plenary.nvim', }, } -- cgit v1.2.3