diff options
| author | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 11:28:12 +0100 |
|---|---|---|
| committer | Vito G. Graffagnino <vito@graffagnino.xyz> | 2022-05-28 11:28:12 +0100 |
| commit | 97d9d5ae1d507aa24ea997b36e937c809d25ca0e (patch) | |
| tree | 484d055e9deb78618a3fba2af6405277e91a8502 /lua/user | |
| parent | 68de5d4fab1cd11d74829947a2809c1899280dea (diff) | |
| parent | 8c5e8b8cfa7c5fb55d45feec918ecba41d75959b (diff) | |
Merge branch 'vgg' into 04-colorscheme04-colorscheme
Diffstat (limited to 'lua/user')
| -rw-r--r-- | lua/user/keymaps.lua | 14 | ||||
| -rw-r--r-- | lua/user/options.lua | 8 |
2 files changed, 9 insertions, 13 deletions
diff --git a/lua/user/keymaps.lua b/lua/user/keymaps.lua index fb8fdb4..e66fca5 100644 --- a/lua/user/keymaps.lua +++ b/lua/user/keymaps.lua @@ -6,9 +6,9 @@ local term_opts = { silent = true } local keymap = vim.api.nvim_set_keymap --Remap space as leader key -keymap("", "<Space>", "<Nop>", opts) -vim.g.mapleader = " " -vim.g.maplocalleader = " " +-- keymap("", "<Space>", "<Nop>", opts) +vim.g.mapleader = "," +vim.g.maplocalleader = "," -- Modes -- normal_mode = "n", @@ -28,8 +28,8 @@ keymap("n", "<C-l>", "<C-w>l", opts) keymap("n", "<leader>e", ":Lex 30<cr>", opts) -- Resize with arrows -keymap("n", "<C-Up>", ":resize -2<CR>", opts) -keymap("n", "<C-Down>", ":resize +2<CR>", opts) +keymap("n", "<C-Up>", ":resize +2<CR>", opts) +keymap("n", "<C-Down>", ":resize -2<CR>", opts) keymap("n", "<C-Left>", ":vertical resize -2<CR>", opts) keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts) @@ -37,10 +37,6 @@ keymap("n", "<C-Right>", ":vertical resize +2<CR>", opts) keymap("n", "<S-l>", ":bnext<CR>", opts) keymap("n", "<S-h>", ":bprevious<CR>", opts) --- Move text up and down -keymap("n", "<A-j>", "<Esc>:m .+1<CR>==gi", opts) -keymap("n", "<A-k>", "<Esc>:m .-2<CR>==gi", opts) - -- Insert -- -- Press jk fast to enter keymap("i", "jk", "<ESC>", opts) diff --git a/lua/user/options.lua b/lua/user/options.lua index 6b38e23..cf23784 100644 --- a/lua/user/options.lua +++ b/lua/user/options.lua @@ -7,16 +7,16 @@ local options = { fileencoding = "utf-8", -- the encoding written to a file hlsearch = true, -- highlight all matches on previous search pattern ignorecase = true, -- ignore case in search patterns - mouse = "a", -- allow the mouse to be used in neovim + mouse = "", -- allow the mouse to be used in neovim pumheight = 10, -- pop up menu height - showmode = false, -- we don't need to see things like -- INSERT -- anymore + showmode = true, -- we don't need to see things like -- INSERT -- anymore showtabline = 2, -- always show tabs smartcase = true, -- smart case smartindent = true, -- make indenting smarter again 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 = 1000, -- time to wait for a mapped sequence to complete (in milliseconds) undofile = true, -- enable persistent undo updatetime = 300, -- faster completion (4000ms default) @@ -26,7 +26,7 @@ local options = { tabstop = 2, -- insert 2 spaces for a tab cursorline = true, -- highlight the current line number = true, -- set numbered lines - relativenumber = false, -- set relative numbered lines + relativenumber = true, -- set relative numbered lines numberwidth = 4, -- set number column width to 2 {default 4} signcolumn = "yes", -- always show the sign column, otherwise it would shift the text each time wrap = false, -- display lines as one long line |