diff --git a/lazy-lock.json b/lazy-lock.json index 9f86bd0..dfc586b 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -27,6 +27,7 @@ "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "snacks.nvim": { "branch": "main", "commit": "fe7cfe9800a182274d0f868a74b7263b8c0c020b" }, "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" }, + "toggleterm.nvim": { "branch": "main", "commit": "50ea089fc548917cc3cc16b46a8211833b9e3c7c" }, "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" }, "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" }, "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" }, diff --git a/lua/config/keymaps.lua b/lua/config/keymaps.lua index 2c134f7..a1ad03e 100644 --- a/lua/config/keymaps.lua +++ b/lua/config/keymaps.lua @@ -1,3 +1,13 @@ -- Keymaps are automatically loaded on the VeryLazy event -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here + +---- Move lines +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +-- Cursor in middle when jumping +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") diff --git a/lua/config/options.lua b/lua/config/options.lua index 3ea1454..95b6d74 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -1,3 +1,8 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here +vim.schedule(function() + vim.o.clipboard = "unnamedplus" +end) + +vim.o.scrolloff = 10 diff --git a/lua/plugins/git.lua b/lua/plugins/git.lua new file mode 100644 index 0000000..e677e2c --- /dev/null +++ b/lua/plugins/git.lua @@ -0,0 +1,15 @@ +return { + { + "lewis6991/gitsigns.nvim", + keys = { + -- Override LazyVim Git Blame popup with inline toggle + { + "tb", + function() + require("gitsigns").toggle_current_line_blame() + end, + desc = "Toggle Inline Blame", + }, + }, + }, +} diff --git a/lua/plugins/toggle-term.lua b/lua/plugins/toggle-term.lua new file mode 100644 index 0000000..7dd3627 --- /dev/null +++ b/lua/plugins/toggle-term.lua @@ -0,0 +1,18 @@ +return { + "akinsho/toggleterm.nvim", + version = "*", + + keys = { + { "tt", "ToggleTerm direction=float", desc = "Toggle Terminal" }, + }, + + opts = { + open_mapping = [[tt]], + direction = "float", + float_opts = { border = "rounded" }, + }, + + config = function(_, opts) + require("toggleterm").setup(opts) + end, +}