From 1a56e26e6b4f3548913b8ebebf074fa33dc60f1d Mon Sep 17 00:00:00 2001 From: anth64 Date: Thu, 10 Apr 2025 22:20:12 +0200 Subject: [PATCH] redid mapping, set and util, also readded nvim-cmp and cmp-nvim-lsp --- init.lua | 2 ++ lua/config/remap.lua | 2 ++ lua/config/set.lua | 30 ++++++++++++++++++++++++++++++ lua/plugins/lsp.lua | 2 ++ lua/plugins/util.lua | 14 ++++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 lua/config/remap.lua create mode 100644 lua/config/set.lua create mode 100644 lua/plugins/util.lua diff --git a/init.lua b/init.lua index ea85cb5..af25cc9 100644 --- a/init.lua +++ b/init.lua @@ -1,3 +1,5 @@ +require("config.set") +require("config.remap") require("config.lazy") vim.lsp.enable( { "luals" }) diff --git a/lua/config/remap.lua b/lua/config/remap.lua new file mode 100644 index 0000000..b760350 --- /dev/null +++ b/lua/config/remap.lua @@ -0,0 +1,2 @@ +vim.g.mapleader = " " +vim.keymap.set("n", "pv", vim.cmd.Ex) diff --git a/lua/config/set.lua b/lua/config/set.lua new file mode 100644 index 0000000..075175c --- /dev/null +++ b/lua/config/set.lua @@ -0,0 +1,30 @@ +vim.opt.shell = "zsh" +vim.opt.fileformat = "unix" +vim.opt.fileformats = "unix" +vim.opt.cmdheight = 0 +vim.opt.guicursor = "" +vim.opt.mouse = "" + +vim.opt.number = true +vim.opt.relativenumber = true + +vim.opt.smartindent = true + +vim.opt.swapfile = false +vim.opt.backup = false +vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir" +vim.opt.undofile = true + +vim.opt.hlsearch = false +vim.opt.incsearch = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.isfname:append("@-@") + +vim.opt.updatetime = 50 + +vim.opt.colorcolumn = "80" +vim.g.c_syntax_for_h = 1 diff --git a/lua/plugins/lsp.lua b/lua/plugins/lsp.lua index 236249a..a499d3a 100644 --- a/lua/plugins/lsp.lua +++ b/lua/plugins/lsp.lua @@ -1,3 +1,5 @@ return { { "nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, + { "hrsh7th/nvim-cmp" }, + { "hrsh7th/cmp-nvim-lsp" } } diff --git a/lua/plugins/util.lua b/lua/plugins/util.lua new file mode 100644 index 0000000..a2ddca3 --- /dev/null +++ b/lua/plugins/util.lua @@ -0,0 +1,14 @@ +return { + { + "mbbill/undotree", + config = function() + vim.keymap.set("n", "u", vim.cmd.UndotreeToggle) + end, + }, + { + "tpope/vim-fugitive", + config = function() + vim.keymap.set("n", "gs", vim.cmd.Git) + end, + }, +}