marvinelsen/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update nvim dotfiles

Browse Source
This commit is contained in:
Marvin Elsen 2025-04-30 09:16:25 +02:00
parent 941fa2a14b
commit a00ce8ab5e
Signed by: marvinelsen
GPG Key ID: 820672408CC318C2
4 changed files with 65 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
nvim/.config/nvim/lazy-lock.json
View File

@ -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" }
}

2
nvim/.config/nvim/lua/config/colorscheme.lua
View File

@ -1,4 +1,4 @@
vim.opt.background = 'dark'
vim.opt.termguicolors = true
vim.cmd.colorscheme 'catppuccin-mocha'
vim.cmd.colorscheme 'catppuccin-macchiato'

95
nvim/.config/nvim/lua/config/keymaps.lua
View File

@ -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', '<leader>ff', builtin.find_files, silent)
--vim.keymap.set('n', '<leader>fg', builtin.live_grep, silent)
--vim.keymap.set('n', '<leader>fb', builtin.buffers, silent)
--vim.keymap.set('n', '<leader>fh', builtin.help_tags, silent)
vim.api.nvim_set_keymap('n', '<C-h>', ':NvimTreeToggle<cr>', {silent = true, noremap = true})
-- shortcuts to change buffers the same way as tabs
-- vim.keymap.set('n', 'gb', ':bn<CR>', silent)
-- vim.keymap.set('n', 'gB', ':bp<CR>', silent)
-- Increment/decrement
vim.keymap.set('n', '+', '<C-a>')
vim.keymap.set('n', '-', '<C-x>')
vim.api.nvim_set_keymap("n", "<C-h>", ":NvimTreeToggle<cr>", {silent = true, noremap = true})
-- Select all
vim.keymap.set('n', '<C-a>', 'gg<S-v>G')
-- Split window
vim.keymap.set('n', '<leader>ss', '<Cmd>split<CR>', opts)
vim.keymap.set('n', '<leader>sv', '<Cmd>vsplit<CR>', opts)
-- Fast save
vim.keymap.set('n', '<leader>w', ':w!<cr>', silent)
vim.keymap.set('n', '<leader>w', ':w!<cr>', opts)
vim.keymap.set('n', '<leader>n', ':NvimTreeToggle<cr>', silent)
vim.keymap.set('n', '<leader>n', ':NvimTreeToggle<cr>', opts)
vim.keymap.set('n', '<leader><space>', ':noh<cr>', silent)
vim.keymap.set('n', '<leader><space>', ':noh<cr>', opts)
-- Remap, because % is mapped to matchit
vim.keymap.set({ 'n', 'v' }, '<tab>', '%', { silent = true, remap = true })
vim.keymap.set('n', '<leader>s', ':%s//<left>', silent)
vim.keymap.set('v', '<leader>s', ':s//<left>', silent)
vim.keymap.set('n', '<leader>S', ':%s//<left>', opts)
vim.keymap.set('v', '<leader>S', ':s//<left>', opts)
-- use enter/backspace to add/remove lines in normal mode
-- New line without entering insert mode
vim.keymap.set('n', '<CR>', 'o<Esc>k', silent)
vim.keymap.set('n', '<S-CR>', 'ko<Esc>j', silent)
vim.keymap.set('n', '<Backspace>', 'ddk', silent)
vim.keymap.set('n', '<CR>', 'o<Esc>k', opts)
vim.keymap.set('n', '<S-CR>', 'ko<Esc>j', opts)
vim.keymap.set('n', '<Backspace>', '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 '>+1<CR>gv=gv")
vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
-- Lazy
vim.keymap.set('n', '<leader>l', '<Cmd>Lazy<CR>', opts)
vim.keymap.set('n', '<leader>u', ':UndotreeToggle<CR>', silent)
-- Move lines in visual mode
vim.keymap.set('v', 'J', ":m '>+1<CR>gv=gv")
vim.keymap.set('v', 'K', ":m '<-2<CR>gv=gv")
vim.keymap.set('n', '<A-,>', '<Cmd>BufferPrevious<CR>', silent)
vim.keymap.set('n', '<A-.>', '<Cmd>BufferNext<CR>', silent)
-- Buffers
vim.keymap.set('n', '<A-,>', '<Cmd>BufferPrevious<CR>', opts)
vim.keymap.set('n', '<A-.>', '<Cmd>BufferNext<CR>', opts)
vim.keymap.set('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', silent)
vim.keymap.set('n', '<A->>', '<Cmd>BufferMoveNext<CR>', silent)
vim.keymap.set('n', '<A-<>', '<Cmd>BufferMovePrevious<CR>', opts)
vim.keymap.set('n', '<A->>', '<Cmd>BufferMoveNext<CR>', opts)
vim.keymap.set('n', '<A-p>', '<Cmd>BufferPin<CR>', opts)
vim.keymap.set('n', '<A-w>', '<Cmd>BufferClose<CR>', opts)
vim.keymap.set('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', silent)
vim.keymap.set('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', silent)
vim.keymap.set('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', silent)
vim.keymap.set('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', silent)
vim.keymap.set('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', silent)
vim.keymap.set('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', silent)
vim.keymap.set('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', silent)
vim.keymap.set('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', silent)
vim.keymap.set('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', silent)
vim.keymap.set('n', '<A-0>', '<Cmd>BufferLast<CR>', silent)
vim.keymap.set('n', '<A-1>', '<Cmd>BufferGoto 1<CR>', opts)
vim.keymap.set('n', '<A-2>', '<Cmd>BufferGoto 2<CR>', opts)
vim.keymap.set('n', '<A-3>', '<Cmd>BufferGoto 3<CR>', opts)
vim.keymap.set('n', '<A-4>', '<Cmd>BufferGoto 4<CR>', opts)
vim.keymap.set('n', '<A-5>', '<Cmd>BufferGoto 5<CR>', opts)
vim.keymap.set('n', '<A-6>', '<Cmd>BufferGoto 6<CR>', opts)
vim.keymap.set('n', '<A-7>', '<Cmd>BufferGoto 7<CR>', opts)
vim.keymap.set('n', '<A-8>', '<Cmd>BufferGoto 8<CR>', opts)
vim.keymap.set('n', '<A-9>', '<Cmd>BufferGoto 9<CR>', opts)
vim.keymap.set('n', '<A-0>', '<Cmd>BufferLast<CR>', opts)
vim.keymap.set('n', '<A-p>', '<Cmd>BufferPin<CR>', silent)
vim.keymap.set('n', '<A-c>', '<Cmd>BufferClose<CR>', silent)
-- Telescope
vim.keymap.set('n', '<leader>ff', '<Cmd>Telescope find_files<CR>', { desc = 'Telescope find files' })
vim.keymap.set('n', '<leader>fg', '<Cmd>Telescope live_grep<CR>', { desc = 'Telescope live grep' })
vim.keymap.set('n', '<leader>fb', '<Cmd>Telescope buffers<CR>', { desc = 'Telescope buffers' })
vim.keymap.set('n', '<leader>fh', '<Cmd>Telescope help_tags<CR>', { desc = 'Telescope help tags' })

4
nvim/.config/nvim/lua/plugins/telescope.lua
View File

@ -1,5 +1,5 @@
return {
'nvim-telescope/telescope.nvim',
tag = '0.1.5',
tag = '0.1.8',
dependencies = { 'nvim-lua/plenary.nvim' }
}
}