From a00ce8ab5e09d1ebd802b1fe77c51812a659dc27 Mon Sep 17 00:00:00 2001 From: Marvin Elsen Date: Wed, 30 Apr 2025 09:16:25 +0200 Subject: [PATCH] Update nvim dotfiles --- nvim/.config/nvim/lazy-lock.json | 24 ++--- nvim/.config/nvim/lua/config/colorscheme.lua | 2 +- nvim/.config/nvim/lua/config/keymaps.lua | 95 ++++++++++---------- nvim/.config/nvim/lua/plugins/telescope.lua | 4 +- 4 files changed, 65 insertions(+), 60 deletions(-) diff --git a/nvim/.config/nvim/lazy-lock.json b/nvim/.config/nvim/lazy-lock.json index e38cca6..0a118e3 100644 --- a/nvim/.config/nvim/lazy-lock.json +++ b/nvim/.config/nvim/lazy-lock.json @@ -1,16 +1,16 @@ { "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, - "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, - "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "gitsigns.nvim": { "branch": "main", "commit": "80214a857ce512cc64964abddc1d8eb5a3e28396" }, - "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, - "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, - "neoscroll.nvim": { "branch": "master", "commit": "532dcc8cea4287c4cad6bb77532989a8217cfc7b" }, - "nvim-surround": { "branch": "main", "commit": "ec2dc7671067e0086cdf29c2f5df2dd909d5f71f" }, - "nvim-tree.lua": { "branch": "master", "commit": "ad0b95dee55955817af635fa121f6e2486b10583" }, - "nvim-treesitter": { "branch": "master", "commit": "7499f7379459db3b31c75cf5cec45f785be6e2c7" }, - "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, - "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, - "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" } + "catppuccin": { "branch": "main", "commit": "5b5e3aef9ad7af84f463d17b5479f06b87d5c429" }, + "friendly-snippets": { "branch": "main", "commit": "572f5660cf05f8cd8834e096d7b4c921ba18e175" }, + "gitsigns.nvim": { "branch": "main", "commit": "fd50977fce4d5240b910d2b816e71fb726cbbaf7" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "15884cee63a8c205334ab13ab1c891cd4d27101a" }, + "neoscroll.nvim": { "branch": "master", "commit": "f957373912e88579e26fdaea4735450ff2ef5c9c" }, + "nvim-surround": { "branch": "main", "commit": "0e62500b98f4513feaaf7425c135472457ea5b7d" }, + "nvim-tree.lua": { "branch": "master", "commit": "be5b788f2dc1522c73fb7afad9092331c8aebe80" }, + "nvim-treesitter": { "branch": "master", "commit": "3b308861a8d7d7bfbe9be51d52e54dcfd9fe3d38" }, + "nvim-web-devicons": { "branch": "master", "commit": "50b5b06bff13a9b4eab946de7c7033649a6618a1" }, + "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, + "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" } } diff --git a/nvim/.config/nvim/lua/config/colorscheme.lua b/nvim/.config/nvim/lua/config/colorscheme.lua index 7111a81..cc5a47a 100644 --- a/nvim/.config/nvim/lua/config/colorscheme.lua +++ b/nvim/.config/nvim/lua/config/colorscheme.lua @@ -1,4 +1,4 @@ vim.opt.background = 'dark' vim.opt.termguicolors = true -vim.cmd.colorscheme 'catppuccin-mocha' \ No newline at end of file +vim.cmd.colorscheme 'catppuccin-macchiato' diff --git a/nvim/.config/nvim/lua/config/keymaps.lua b/nvim/.config/nvim/lua/config/keymaps.lua index 9237aaa..29118ab 100644 --- a/nvim/.config/nvim/lua/config/keymaps.lua +++ b/nvim/.config/nvim/lua/config/keymaps.lua @@ -1,71 +1,76 @@ --- ============================================================================ --- Major Maps *major-maps* {{{1 vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' --- }}}1 -local silent = { silent = true, noremap = true } +local opts = { silent = true, noremap = true } --- Telescope ---local builtin = require('telescope.builtin') ---vim.keymap.set('n', 'ff', builtin.find_files, silent) ---vim.keymap.set('n', 'fg', builtin.live_grep, silent) ---vim.keymap.set('n', 'fb', builtin.buffers, silent) ---vim.keymap.set('n', 'fh', builtin.help_tags, silent) +vim.api.nvim_set_keymap('n', '', ':NvimTreeToggle', {silent = true, noremap = true}) --- shortcuts to change buffers the same way as tabs --- vim.keymap.set('n', 'gb', ':bn', silent) --- vim.keymap.set('n', 'gB', ':bp', silent) +-- Increment/decrement +vim.keymap.set('n', '+', '') +vim.keymap.set('n', '-', '') -vim.api.nvim_set_keymap("n", "", ":NvimTreeToggle", {silent = true, noremap = true}) +-- Select all +vim.keymap.set('n', '', 'ggG') + +-- Split window +vim.keymap.set('n', 'ss', 'split', opts) +vim.keymap.set('n', 'sv', 'vsplit', opts) -- Fast save -vim.keymap.set('n', 'w', ':w!', silent) +vim.keymap.set('n', 'w', ':w!', opts) -vim.keymap.set('n', 'n', ':NvimTreeToggle', silent) +vim.keymap.set('n', 'n', ':NvimTreeToggle', opts) -vim.keymap.set('n', '', ':noh', silent) +vim.keymap.set('n', '', ':noh', opts) -- Remap, because % is mapped to matchit vim.keymap.set({ 'n', 'v' }, '', '%', { silent = true, remap = true }) -vim.keymap.set('n', 's', ':%s//', silent) -vim.keymap.set('v', 's', ':s//', silent) +vim.keymap.set('n', 'S', ':%s//', opts) +vim.keymap.set('v', 'S', ':s//', opts) -- use enter/backspace to add/remove lines in normal mode -- New line without entering insert mode -vim.keymap.set('n', '', 'ok', silent) -vim.keymap.set('n', '', 'koj', silent) -vim.keymap.set('n', '', 'ddk', silent) +vim.keymap.set('n', '', 'ok', opts) +vim.keymap.set('n', '', 'koj', opts) +vim.keymap.set('n', '', 'ddk', opts) -- Do not fill the yank register with single chars -vim.keymap.set('n', 'x', '"_x', silent) -vim.keymap.set('n', 'X', '"_X', silent) +vim.keymap.set('n', 'x', '"_x', opts) +vim.keymap.set('n', 'X', '"_X', opts) -vim.keymap.set("n", "J", "mzJ`z") +-- Better line joining +vim.keymap.set('n', 'J', 'mzJ`z') -vim.keymap.set("v", "J", ":m '>+1gv=gv") -vim.keymap.set("v", "K", ":m '<-2gv=gv") +-- Lazy +vim.keymap.set('n', 'l', 'Lazy', opts) -vim.keymap.set('n', 'u', ':UndotreeToggle', silent) +-- Move lines in visual mode +vim.keymap.set('v', 'J', ":m '>+1gv=gv") +vim.keymap.set('v', 'K', ":m '<-2gv=gv") -vim.keymap.set('n', '', 'BufferPrevious', silent) -vim.keymap.set('n', '', 'BufferNext', silent) +-- Buffers +vim.keymap.set('n', '', 'BufferPrevious', opts) +vim.keymap.set('n', '', 'BufferNext', opts) -vim.keymap.set('n', '', 'BufferMovePrevious', silent) -vim.keymap.set('n', '>', 'BufferMoveNext', silent) +vim.keymap.set('n', '', 'BufferMovePrevious', opts) +vim.keymap.set('n', '>', 'BufferMoveNext', opts) +vim.keymap.set('n', '', 'BufferPin', opts) +vim.keymap.set('n', '', 'BufferClose', opts) -vim.keymap.set('n', '', 'BufferGoto 1', silent) -vim.keymap.set('n', '', 'BufferGoto 2', silent) -vim.keymap.set('n', '', 'BufferGoto 3', silent) -vim.keymap.set('n', '', 'BufferGoto 4', silent) -vim.keymap.set('n', '', 'BufferGoto 5', silent) -vim.keymap.set('n', '', 'BufferGoto 6', silent) -vim.keymap.set('n', '', 'BufferGoto 7', silent) -vim.keymap.set('n', '', 'BufferGoto 8', silent) -vim.keymap.set('n', '', 'BufferGoto 9', silent) -vim.keymap.set('n', '', 'BufferLast', silent) +vim.keymap.set('n', '', 'BufferGoto 1', opts) +vim.keymap.set('n', '', 'BufferGoto 2', opts) +vim.keymap.set('n', '', 'BufferGoto 3', opts) +vim.keymap.set('n', '', 'BufferGoto 4', opts) +vim.keymap.set('n', '', 'BufferGoto 5', opts) +vim.keymap.set('n', '', 'BufferGoto 6', opts) +vim.keymap.set('n', '', 'BufferGoto 7', opts) +vim.keymap.set('n', '', 'BufferGoto 8', opts) +vim.keymap.set('n', '', 'BufferGoto 9', opts) +vim.keymap.set('n', '', 'BufferLast', opts) -vim.keymap.set('n', '', 'BufferPin', silent) - -vim.keymap.set('n', '', 'BufferClose', silent) +-- Telescope +vim.keymap.set('n', 'ff', 'Telescope find_files', { desc = 'Telescope find files' }) +vim.keymap.set('n', 'fg', 'Telescope live_grep', { desc = 'Telescope live grep' }) +vim.keymap.set('n', 'fb', 'Telescope buffers', { desc = 'Telescope buffers' }) +vim.keymap.set('n', 'fh', 'Telescope help_tags', { desc = 'Telescope help tags' }) diff --git a/nvim/.config/nvim/lua/plugins/telescope.lua b/nvim/.config/nvim/lua/plugins/telescope.lua index 495f364..cab94b6 100644 --- a/nvim/.config/nvim/lua/plugins/telescope.lua +++ b/nvim/.config/nvim/lua/plugins/telescope.lua @@ -1,5 +1,5 @@ return { 'nvim-telescope/telescope.nvim', - tag = '0.1.5', + tag = '0.1.8', dependencies = { 'nvim-lua/plenary.nvim' } -} \ No newline at end of file +}