From aee3e63a6790d19f7d3b27d9ddd32b2e4c6a7f3c Mon Sep 17 00:00:00 2001 From: droctothorpe Date: Wed, 9 Feb 2022 23:47:55 -0500 Subject: [PATCH 1/4] Add missing space in comment --- lua/user/keymaps.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 32b6a04fe..f38051175 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -5,7 +5,7 @@ local term_opts = { silent = true } -- Shorten function name local keymap = vim.api.nvim_set_keymap ---Remap space as leader key +-- Remap space as leader key keymap("", "", "", opts) vim.g.mapleader = " " vim.g.maplocalleader = " " From 35a0e3be19b6ee9a994ef2647e5ae6ddeb9b831c Mon Sep 17 00:00:00 2001 From: droctothorpe Date: Mon, 14 Feb 2022 23:25:11 -0500 Subject: [PATCH 2/4] Enable operators to support gcc comments --- lua/user/whichkey.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index 11b6a7ea3..cce19ab76 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -14,7 +14,7 @@ local setup = { -- the presets plugin, adds help for a bunch of default keybindings in Neovim -- No actual key bindings are created presets = { - operators = false, -- adds help for operators like d, y, ... and registers them for motion / text object completion + operators = true, -- adds help for operators like d, y, ... and registers them for motion / text object completion motions = true, -- adds help for motions text_objects = true, -- help for text objects triggered after entering an operator windows = true, -- default bindings on From 6ddae98be9beb0f1ca278fc0abeea1506d5cc2c9 Mon Sep 17 00:00:00 2001 From: droctothorpe Date: Mon, 21 Feb 2022 21:49:20 -0500 Subject: [PATCH 3/4] Preliminary customization --- init.lua | 1 + lua/user/keymaps.lua | 4 ++-- lua/user/options.lua | 2 +- lua/user/plugins.lua | 19 ++++++++++++++++--- lua/user/toggleterm.lua | 2 +- lua/user/whichkey.lua | 1 + 6 files changed, 22 insertions(+), 7 deletions(-) diff --git a/init.lua b/init.lua index 6b875737d..82dad0b4b 100644 --- a/init.lua +++ b/init.lua @@ -2,6 +2,7 @@ require "user.options" require "user.keymaps" require "user.plugins" require "user.colorscheme" +vim.cmd "colorscheme nord" require "user.cmp" require "user.lsp" require "user.telescope" diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index f38051175..643c6cc35 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -36,8 +36,8 @@ keymap("n", "", ":bnext", opts) keymap("n", "", ":bprevious", opts) -- Move text up and down -keymap("n", "", ":m .+1==gi", opts) -keymap("n", "", ":m .-2==gi", opts) +keymap("n", "", ":m .+1==gi", opts) +keymap("n", "", ":m .-2==gi", opts) -- Insert -- -- Press jk fast to enter diff --git a/lua/user/options.lua b/lua/user/options.lua index 799aa9d62..4ca6757f9 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -16,7 +16,7 @@ local options = { splitbelow = true, -- force all horizontal splits to go below current window splitright = true, -- force all vertical splits to go to the right of current window swapfile = false, -- creates a swapfile - -- termguicolors = true, -- set term gui colors (most terminals support this) + termguicolors = true, -- set term gui colors (most terminals support this) timeoutlen = 100, -- time to wait for a mapped sequence to complete (in milliseconds) undofile = true, -- enable persistent undo updatetime = 300, -- faster completion (4000ms default) diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index 2aa1f935b..ff427b503 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -52,7 +52,6 @@ return packer.startup(function(use) use "moll/vim-bbye" use "nvim-lualine/lualine.nvim" use "akinsho/toggleterm.nvim" - use "ahmedkhalf/project.nvim" use "lewis6991/impatient.nvim" use "lukas-reineke/indent-blankline.nvim" use "goolord/alpha-nvim" @@ -60,8 +59,10 @@ return packer.startup(function(use) use "folke/which-key.nvim" -- Colorschemes - -- use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out - use "lunarvim/darkplus.nvim" + use "lunarvim/colorschemes" -- A bunch of colorschemes you can try out + use "arcticicestudio/nord-vim" + -- use "lunarvim/darkplus.nvim" + -- cmp plugins use "hrsh7th/nvim-cmp" -- The completion plugin @@ -94,6 +95,18 @@ return packer.startup(function(use) -- Git use "lewis6991/gitsigns.nvim" + -- project + use { + "ahmedkhalf/project.nvim", + config = function() + require("project_nvim").setup { + -- your configuration comes here + -- or leave it empty to use the default settings + -- refer to the configuration section below + } + end + } + -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins if PACKER_BOOTSTRAP then diff --git a/lua/user/toggleterm.lua b/lua/user/toggleterm.lua index cecbd9984..d839a2bbb 100644 --- a/lua/user/toggleterm.lua +++ b/lua/user/toggleterm.lua @@ -33,7 +33,7 @@ function _G.set_terminal_keymaps() vim.api.nvim_buf_set_keymap(0, 't', '', [[h]], opts) vim.api.nvim_buf_set_keymap(0, 't', '', [[j]], opts) vim.api.nvim_buf_set_keymap(0, 't', '', [[k]], opts) - vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) + -- vim.api.nvim_buf_set_keymap(0, 't', '', [[l]], opts) end vim.cmd('autocmd! TermOpen term://* lua set_terminal_keymaps()') diff --git a/lua/user/whichkey.lua b/lua/user/whichkey.lua index cce19ab76..6108b7597 100644 --- a/lua/user/whichkey.lua +++ b/lua/user/whichkey.lua @@ -95,6 +95,7 @@ local mappings = { }, ["F"] = { "Telescope live_grep theme=ivy", "Find Text" }, ["P"] = { "lua require('telescope').extensions.projects.projects()", "Projects" }, + ["r"] = { "Telescope command_history", "Command History" }, p = { name = "Packer", From e74795861cf914d01c451625e29461cf519c1e29 Mon Sep 17 00:00:00 2001 From: droctothorpe Date: Wed, 16 Mar 2022 10:01:15 -0400 Subject: [PATCH 4/4] Add multiple cursor support --- lua/user/keymaps.lua | 6 +++--- lua/user/plugins.lua | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index 643c6cc35..89ba33d94 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -36,12 +36,12 @@ keymap("n", "", ":bnext", opts) keymap("n", "", ":bprevious", opts) -- Move text up and down -keymap("n", "", ":m .+1==gi", opts) -keymap("n", "", ":m .-2==gi", opts) +keymap("n", "", ":m .+1==gi", opts) +keymap("n", "", ":m .-2==gi", opts) -- Insert -- -- Press jk fast to enter -keymap("i", "jk", "", opts) +-- keymap("i", "jk", "", opts) -- Visual -- -- Stay in indent mode diff --git a/lua/user/plugins.lua b/lua/user/plugins.lua index ff427b503..56f5d365c 100644 --- a/lua/user/plugins.lua +++ b/lua/user/plugins.lua @@ -107,6 +107,8 @@ return packer.startup(function(use) end } + use "terryma/vim-multiple-cursors" + -- Automatically set up your configuration after cloning packer.nvim -- Put this at the end after all plugins if PACKER_BOOTSTRAP then