From 75ffdb60ea62983d39419091d33724cfd7200689 Mon Sep 17 00:00:00 2001 From: Norm Rasmussen Date: Wed, 29 Jun 2022 17:16:38 -0400 Subject: [PATCH] new plugins --- init.lua | 2 ++ lua/keymaps.lua | 14 +++++++++----- lua/plugins/marks.lua | 31 +++++++++++++++++++++++++++++++ lua/plugins/nvim-tree.lua | 17 ----------------- lua/plugins/plugins.lua | 16 ++++++++++++++-- plugin/packer_compiled.lua | 37 ++++++++++++++++++++++++++++++++++++- 6 files changed, 92 insertions(+), 25 deletions(-) create mode 100644 lua/plugins/marks.lua diff --git a/init.lua b/init.lua index f3f3f06..cb145bb 100755 --- a/init.lua +++ b/init.lua @@ -13,3 +13,5 @@ require('plugins/telescope') require('plugins/alpha-nvim') require('plugins/symbols-outline') require('plugins/nvim-lsp-installer') +require('plugins/neoscroll') +require('plugins/marks') diff --git a/lua/keymaps.lua b/lua/keymaps.lua index 57f4516..892173d 100644 --- a/lua/keymaps.lua +++ b/lua/keymaps.lua @@ -1,7 +1,6 @@ ----------------------------------------------------------- -- Keymaps of Neovim and installed plugins. ----------------------------------------------------------- - local map = vim.api.nvim_set_keymap local default_opts = { noremap = true, silent = true } @@ -22,7 +21,7 @@ map('n', '', 'l', default_opts) map('n', 't', ':tabnew', default_opts) map('n', 'w', ':-tabnext', default_opts) map('n', 'e', ':+tabnext', default_opts) -map('n', 'q', ':tabclose', default_opts) +map('n', 'r', ':tabclose', default_opts) ----------------------------------------------------------- -- Applications and Plugins shortcuts @@ -30,17 +29,22 @@ map('n', 'q', ':tabclose', default_opts) -- Open terminal -- map('n', '', ':Term', { noremap = true }) +-- Vista Shortcuts +map('n', 'v', ':Vista!!', default_opts) -- show Vista panel -- nvim-tree map('n', '', ':NvimTreeToggle', default_opts) -- open/close -map('n', 'r', ':NvimTreeRefresh', default_opts) -- refresh -map('n', 'n', ':NvimTreeFindFile', default_opts) -- search file +map('n', 'q', ':NvimTreeRefresh', default_opts) -- refresh -- Vista tag-viewer map('n', '', ':Vista!!', default_opts) -- open/close +-- Place Check box for To-Do style Lists +map('i','', '[ ] - ', default_opts) +map('n','', 'rXi', default_opts) +map('n','x', '~~~', default_opts) + -- Vim Tmux Navigator -map ('n', '=', ':TmuxNavigateUp', default_opts) map ('n', '-', ':TmuxNavigateDown', default_opts) map ('n', '[', ':TmuxNavigateLeft', default_opts) map ('n', ']', ':TmuxNavigateRight', default_opts) diff --git a/lua/plugins/marks.lua b/lua/plugins/marks.lua new file mode 100644 index 0000000..b217b0a --- /dev/null +++ b/lua/plugins/marks.lua @@ -0,0 +1,31 @@ +require'marks'.setup { + -- whether to map keybinds or not. default true + default_mappings = true, + -- which builtin marks to show. default {} + builtin_marks = { ".", "<", ">", "^" }, + -- whether movements cycle back to the beginning/end of buffer. default true + cyclic = true, + -- whether the shada file is updated after modifying uppercase marks. default false + force_write_shada = false, + -- how often (in ms) to redraw signs/recompute mark positions. + -- higher values will have better performance but may cause visual lag, + -- while lower values may cause performance penalties. default 150. + refresh_interval = 250, + -- sign priorities for each type of mark - builtin marks, uppercase marks, lowercase + -- marks, and bookmarks. + -- can be either a table with all/none of the keys, or a single number, in which case + -- the priority applies to all marks. + -- default 10. + sign_priority = { lower=10, upper=15, builtin=8, bookmark=20 }, + -- disables mark tracking for specific filetypes. default {} + excluded_filetypes = {}, + -- marks.nvim allows you to configure up to 10 bookmark groups, each with its own + -- sign/virttext. Bookmarks can be used to group together positions and quickly move + -- across multiple buffers. default sign is '!@#$%^&*()' (from 0 to 9), and + -- default virt_text is "". + bookmark_0 = { + sign = "⚑", + virt_text = "hello world" + }, + mappings = {} +} diff --git a/lua/plugins/nvim-tree.lua b/lua/plugins/nvim-tree.lua index 46722f0..e85a82a 100644 --- a/lua/plugins/nvim-tree.lua +++ b/lua/plugins/nvim-tree.lua @@ -13,23 +13,6 @@ --- See: `help NvimTree` local g = vim.g -g.nvim_tree_quit_on_open = 0 -g.nvim_tree_indent_markers = 1 -g.nvim_tree_git_hl = 1 -g.nvim_tree_highlight_opened_files = 1 -g.nvim_tree_disable_window_picker = 1 -g.nvim_tree_respect_buf_cwd = 1 -g.nvim_tree_width_allow_resize = 1 -g.nvim_tree_show_icons = { - git = 1, - folders = 1, - files = 1 -} - -g.nvim_tree_icons = { - default = "‣ " -} - require('nvim-tree').setup { open_on_setup = true, update_cwd = true, diff --git a/lua/plugins/plugins.lua b/lua/plugins/plugins.lua index 3d938fc..192242e 100755 --- a/lua/plugins/plugins.lua +++ b/lua/plugins/plugins.lua @@ -64,7 +64,7 @@ return require'packer'.startup(function() } use { - 'famiu/feline.nvim', + 'feline-nvim/feline.nvim', requires = { 'kyazdani42/nvim-web-devicons' }, } @@ -100,9 +100,21 @@ return require'packer'.startup(function() requires = { 'L3MON4D3/LuaSnip', 'hrsh7th/cmp-nvim-lsp', + 'quangnguyen30192/cmp-nvim-ultisnips', + 'hrsh7th/cmp-calc', + 'f3fora/cmp-spell', + 'hrsh7th/cmp-emoji', + 'hrsh7th/cmp-look', 'hrsh7th/cmp-path', 'hrsh7th/cmp-buffer', 'saadparwaiz1/cmp_luasnip', - }, + } } + use { + 'tzachar/cmp-tabnine', + run = './install.sh', + requires = 'hrsh7th/nvim-cmp' + } + use 'chentoast/marks.nvim' + end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua index ecb99c0..1ae5c8a 100644 --- a/plugin/packer_compiled.lua +++ b/plugin/packer_compiled.lua @@ -89,16 +89,46 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-buffer", url = "https://github.com/hrsh7th/cmp-buffer" }, + ["cmp-calc"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-calc", + url = "https://github.com/hrsh7th/cmp-calc" + }, + ["cmp-emoji"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-emoji", + url = "https://github.com/hrsh7th/cmp-emoji" + }, + ["cmp-look"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-look", + url = "https://github.com/hrsh7th/cmp-look" + }, ["cmp-nvim-lsp"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp", url = "https://github.com/hrsh7th/cmp-nvim-lsp" }, + ["cmp-nvim-ultisnips"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-nvim-ultisnips", + url = "https://github.com/quangnguyen30192/cmp-nvim-ultisnips" + }, ["cmp-path"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-path", url = "https://github.com/hrsh7th/cmp-path" }, + ["cmp-spell"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-spell", + url = "https://github.com/f3fora/cmp-spell" + }, + ["cmp-tabnine"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp-tabnine", + url = "https://github.com/tzachar/cmp-tabnine" + }, cmp_luasnip = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/cmp_luasnip", @@ -122,7 +152,7 @@ _G.packer_plugins = { ["feline.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/feline.nvim", - url = "https://github.com/famiu/feline.nvim" + url = "https://github.com/feline-nvim/feline.nvim" }, ["gitsigns.nvim"] = { loaded = true, @@ -139,6 +169,11 @@ _G.packer_plugins = { path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/indent-blankline.nvim", url = "https://github.com/lukas-reineke/indent-blankline.nvim" }, + ["marks.nvim"] = { + loaded = true, + path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/marks.nvim", + url = "https://github.com/chentoast/marks.nvim" + }, ["monokai.nvim"] = { loaded = true, path = "/Users/normrasmussen/.local/share/nvim/site/pack/packer/start/monokai.nvim",