From 1edbc828934a2f66537d624b47f16cef81b80176 Mon Sep 17 00:00:00 2001 From: Michiel Schuurmans Date: Fri, 26 Dec 2025 22:37:12 +0100 Subject: More config --- lazy-lock.json | 22 +++++++++++++--------- lua/config/remap.lua | 4 ++++ lua/plugins/marks.lua | 8 ++++++++ lua/plugins/telescope.lua | 5 +++-- 4 files changed, 28 insertions(+), 11 deletions(-) create mode 100644 lua/plugins/marks.lua diff --git a/lazy-lock.json b/lazy-lock.json index a70961f..de87918 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -2,19 +2,23 @@ "LuaSnip": { "branch": "master", "commit": "3732756842a2f7e0e76a7b0487e9692072857277" }, "cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" }, "cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "cbc7b02bb99fae35cb42f514762b89b5126651ef" }, "cmp-path": { "branch": "main", "commit": "c642487086dbd9a93160e1679a1327be111cbc25" }, "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" }, - "conform.nvim": { "branch": "master", "commit": "cde4da5c1083d3527776fee69536107d98dae6c9" }, - "fidget.nvim": { "branch": "main", "commit": "e32b672d8fd343f9d6a76944fedb8c61d7d8111a" }, - "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "b1d9a914b02ba5660f1e272a03314b31d4576fe2" }, - "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, - "nvim-cmp": { "branch": "main", "commit": "106c4bcc053a5da783bf4a9d907b6f22485c2ea0" }, - "nvim-lspconfig": { "branch": "master", "commit": "c8503e63c6afab3ed34b49865a4a4edbb1ebf4a8" }, + "conform.nvim": { "branch": "master", "commit": "5420c4b5ea0aeb99c09cfbd4fd0b70d257b44f25" }, + "fidget.nvim": { "branch": "main", "commit": "64463022a1f2ff1318ab22a2ea4125ed9313a483" }, + "lazy.nvim": { "branch": "main", "commit": "306a05526ada86a7b30af95c5cc81ffba93fef97" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "9f9c67795d0795a6e8612f5a899ca64a074a1076" }, + "mason.nvim": { "branch": "main", "commit": "57e5a8addb8c71fb063ee4acda466c7cf6ad2800" }, + "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, + "nvim-cmp": { "branch": "main", "commit": "d97d85e01339f01b842e6ec1502f639b080cb0fc" }, + "nvim-dap": { "branch": "master", "commit": "818cd8787a77a97703eb1d9090543a374f79a9ac" }, + "nvim-java": { "branch": "main", "commit": "d196b25eda89ae957110f2966d1753889dc197b2" }, + "nvim-lspconfig": { "branch": "master", "commit": "d696e36d5792daf828f8c8e8d4b9aa90c1a10c2a" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, - "nvim-treesitter-context": { "branch": "master", "commit": "660861b1849256398f70450afdf93908d28dc945" }, + "nvim-treesitter-context": { "branch": "master", "commit": "64dd4cf3f6fd0ab17622c5ce15c91fc539c3f24a" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "spring-boot.nvim": { "branch": "main", "commit": "218c0c26c14d99feca778e4d13f5ec3e8b1b60f0" }, "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, "vim-fugitive": { "branch": "master", "commit": "61b51c09b7c9ce04e821f6cf76ea4f6f903e3cf4" } } diff --git a/lua/config/remap.lua b/lua/config/remap.lua index 78a17ab..d860c37 100644 --- a/lua/config/remap.lua +++ b/lua/config/remap.lua @@ -8,3 +8,7 @@ vim.api.nvim_set_keymap('n', ';', ":", { noremap = true }) vim.opt.expandtab = false vim.opt.tabstop = 8 vim.opt.shiftwidth = 8 + +vim.opt.number = true +vim.opt.relativenumber = true +vim.opt.signcolumn = "number" diff --git a/lua/plugins/marks.lua b/lua/plugins/marks.lua new file mode 100644 index 0000000..2add911 --- /dev/null +++ b/lua/plugins/marks.lua @@ -0,0 +1,8 @@ +return { + "chentoast/marks.nvim", + config = function() + require("marks").setup({ + default_mappings = true + }) + end +} diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 3b861b9..4c90a21 100644 --- a/lua/plugins/telescope.lua +++ b/lua/plugins/telescope.lua @@ -11,8 +11,9 @@ return { require('telescope').setup({}) local builtin = require('telescope.builtin') - vim.keymap.set('n', 'pf', builtin.find_files, {}) - vim.keymap.set('n', '', builtin.git_files, {}) + vim.keymap.set('n', 'ff', builtin.find_files, {}) + vim.keymap.set('n', 'fg', builtin.live_grep, {}) + vim.keymap.set('n', 'fp', builtin.git_files, {}) vim.keymap.set('n', 'pws', function() local word = vim.fn.expand("") builtin.grep_string({ search = word }) -- cgit v1.3