Improved neovim config

.config/nvim/lua/config/autocmds.lua

@@ -5,3 +5,16 @@ on("VimEnter", {
 		require("nvim-tree.api").tree.toggle({ focus = false })
 	end,
 })
+
+on({ "TermOpen", "TermEnter" }, {
+	callback = function()
+		vim.wo.signcolumn = "no"
+	end,
+})
+
+on({ "BufNewFile", "BufRead" }, {
+	pattern = { "*.txt", "*.md" },
+	callback = function()
+		vim.lo.wrap = true
+	end,
+})

.config/nvim/lua/config/keys.lua

@@ -1,25 +1,29 @@
-local map = vim.keymap.set
+local map = function(mode, lhs, rhs, info)
+	vim.keymap.set(mode, lhs, rhs, { desc = info })
+end
 
--- Normal mode
-map("n", "<C-n>", "<cmd>enew<cr>", { desc = "New File" })
-map("n", "<C-b>", "<cmd>NvimTreeToggle<cr>", { desc = "Toggle file explorer" })
-map("n", "<C-q>", "<cmd>qa<cr>", { desc = "Quit all" })
-map("n", "<leader>l", "<cmd>Lazy<cr>", { desc = "Lazy" })
-map("n", "<leader>f", "<cmd>Telescope find_files<cr>", { desc = "Find files" })
-map("n", "<leader>r", "<cmd>Telescope oldfiles<cr>", { desc = "Recent files" })
-map("n", "<leader>s", "<cmd>Telescope symbols<cr>", { desc = "Symbols" })
-map("n", "<leader>cf", vim.lsp.buf.format, { desc = "Format" })
-map("n", "gd", vim.lsp.buf.definition, { desc = "Go to definition" })
-map("n", "gr", vim.lsp.buf.references, { desc = "Go to references" })
+-- Basics
+map("n", "<C-n>", "<cmd>enew<cr>", "New File")
+map({ "i", "n", "s", "v" }, "<C-s>", "<cmd>w<cr><esc>", "Save file")
+map("n", "<C-q>", "<cmd>qa<cr>", "Quit all")
+map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", "Clear search")
 
--- Visual mode
+-- Indenting
 map("v", "<", "<gv")
 map("v", ">", ">gv")
 
--- Mixed modes
-map({ "i", "n" }, "<esc>", "<cmd>noh<cr><esc>", { desc = "Clear search" })
-map({ "i", "v", "n", "s" }, "<C-s>", "<cmd>w<cr><esc>", { desc = "Save file" })
+-- LSP
+map("n", "gd", vim.lsp.buf.definition, "Go to definition")
+map("n", "gr", vim.lsp.buf.references, "Go to references")
+map("n", "<leader>cf", vim.lsp.buf.format, "Format")
 
 -- Toggle comment
-map("n", "<leader>/", "<cmd>lua require('Comment.api').toggle.linewise.current()<cr>", { desc = "Toggle comment" })
-map("v", "<leader>/", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", { desc = "Toggle comment" })
+map("n", "<C-_>", "<cmd>lua require('Comment.api').toggle.linewise.current()<cr>", "Toggle comment")
+map("v", "<C-_>", "<esc><cmd>lua require('Comment.api').toggle.linewise(vim.fn.visualmode())<cr>", "Toggle comment")
+
+-- Normal mode
+map("n", "<C-b>", "<cmd>NvimTreeToggle<cr>", "Toggle tree")
+map("n", "<leader>l", "<cmd>Lazy<cr>", "Lazy")
+map("n", "<leader>f", "<cmd>Telescope find_files<cr>", "Find files")
+map("n", "<leader>r", "<cmd>Telescope oldfiles<cr>", "Recent files")
+map({ "n", "t" }, "<A-i>", "<cmd>lua require('nvterm.terminal').toggle('float')<cr>", "Toggle terminal")

.config/nvim/lua/config/settings.lua

@@ -4,22 +4,34 @@ g.loaded_netrw = 1
 g.loaded_netrwPlugin = 1
 
 local opt = vim.opt
-opt.autowrite = false
-opt.expandtab = false
-opt.shiftwidth = 4
-opt.tabstop = 4
-opt.softtabstop = 4
 opt.autoindent = true
-opt.smartindent = true
-opt.spell = false
+opt.autowrite = false
+opt.clipboard = "unnamedplus"
 opt.conceallevel = 0
-opt.ignorecase = false
-opt.number = true
-opt.relativenumber = false
 opt.cursorline = true
 opt.cursorlineopt = "both"
-opt.termguicolors = true
-opt.signcolumn = "yes"
+opt.expandtab = false
+opt.grepformat = "%f:%l:%c:%m"
+opt.grepprg = "rg --vimgrep"
+opt.ignorecase = false
 opt.laststatus = 0
-opt.showmode = false
+opt.mouse = "a"
+opt.number = true
+opt.relativenumber = false
 opt.ruler = false
+opt.sessionoptions = { "buffers", "curdir", "tabpages", "winsize" }
+opt.shiftwidth = 4
+opt.showmode = false
+opt.signcolumn = "yes"
+opt.smartindent = true
+opt.softtabstop = 4
+opt.spell = false
+opt.splitbelow = true
+opt.splitright = true
+opt.tabstop = 4
+opt.termguicolors = true
+opt.undofile = true
+opt.undolevels = 10000
+opt.updatetime = 250
+opt.wildmode = "longest:full,full"
+opt.wrap = false