Merge branch 'fast'

1 files changed, 20 insertions, 47 deletions

diff --git a/lua/config/map.lua b/lua/config/map.lua
index 27c6bb9..80e2b6c 100644
--- a/lua/config/map.lua
+++ b/lua/config/map.lua
@@ -4,95 +4,70 @@ local map = vim.keymap.set
 vim.g.mapleader = " "
 vim.g.maplocalleader = ","
 
+local function verbose_toggle(value, name)
+	local toggle = value == false
+	if toggle == true then
+		print("Enabled " .. name .. ".")
+	else
+		print("Disabled " .. name .. ".")
+	end
+	return toggle
+end
 
 -- open config
 map("n", " c", function()
 	vim.cmd("cd ~/.config/nvim")
 	vim.cmd("e " .. "init.lua")
 end, { desc = "Open neovim config file" })
--- Move text easilly
-map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selected text up" })
-map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move selected text down" })
 
-map("n", "<M-b>", "<cmd>make<cr>", { desc = "Make" })
-
--- better find next and previous
-map("n", "n", "nzzzv", { desc = "Keep cursor in middle with search" })
-map("n", "N", "Nzzzv", { desc = "Keep cursor in middle with search" })
-
-map("n", "J", "mzJ`z", { desc = "Move up next line with space in between" })
-
--- greatest remap ever
-map("x", " p", [["_dP]], { desc = "Paste while keeping the registry" })
-
--- moving
+-- insert navigation
 map("i", "<C-a>", "<C-o>I", { noremap = true })
 map("i", "<C-e>", "<C-o>A", { noremap = true })
 
 -- buffers
-map("n", " sp", "<cmd>sp<cr>", { desc = "Open horizontal split" })
-map("n", " vs", "<cmd>vs<cr>", { desc = "Open vertical split" })
 map("n", " q", "<cmd>q!<cr>", { noremap = true })
 map("n", " Q", "<cmd>qa!<cr>", { noremap = true })
--- close all except focused buffer
-map("n", " 1", "<cmd>%bd|e#<cr>", { noremap = true })
--- next tab
-map("n", "+", "<cmd>tabe .<cr>", { noremap = true })
+map("n", "!", "<cmd>sp<CR><cmd>term<CR>", { desc = "Open terminal" })
+map("n", "<M-b>", "<cmd>make<cr>", { desc = "Make" })
 
 -- better indenting
 map("v", "<", "<gv")
 map("v", ">", ">gv")
+map("v", "J", ":m '>+1<CR>gv=gv", { desc = "Move selected text up" })
+map("v", "K", ":m '<-2<CR>gv=gv", { desc = "Move selected text down" })
+map("x", " p", [["_dP]], { desc = "Paste while keeping the registry" })
+map("n", "n", "nzzzv", { desc = "Keep cursor in middle with search" })
+map("n", "N", "Nzzzv", { desc = "Keep cursor in middle with search" })
+map("n", "J", "mzJ`z", { desc = "Move up next line with space in between" })
 
 -- allow for use of system clipboard fast
 map({ "n", "v" }, " y", [["+y]])
 map("n", " Y", [["+Y]])
 map({ "n", "v" }, " P", [["+p]])
 
--- templates
-map("n", "<LocalLeader>rt", ":-1r " .. vim.fn.stdpath("config") .. "/templates", { noremap = true })
-
 -- hide all
 local hidden = true -- flag
 vim.api.nvim_create_user_command("Hide", function()
 	hidden = hidden == false
 	vim.opt.showmode = hidden
 	vim.opt.ruler = hidden
-	vim.opt.nu = hidden
-	vim.opt.rnu = hidden
 	vim.opt.showcmd = hidden
 	vim.opt.laststatus = hidden and 2 or 0
-	vim.opt.signcolumn = hidden and "yes" or "no"
 end, {})
 
--- write
 map("n", " x", "!cx %", { desc = "Toggle file as executable" })
 map("n", " w", "<cmd>write<cr>", { noremap = true })
-map("n", " W", "<cmd>write!<cr>", { noremap = true })
-map("n", " e", "<cmd>edit<cr>", { noremap = true })
 map("n", ",s", function()
 	vim.cmd.source()
 	print("Sourced.")
 end, { noremap = true })
 
--- Lazy
-map("n", " P", "<cmd>Lazy<cr>", { noremap = true })
-
-local function verbose_toggle(value, name)
-	local toggle = value == false
-	if toggle == true then
-		print("Enabled " .. name .. ".")
-	else
-		print("Disabled " .. name .. ".")
-	end
-	return toggle
-end
-
 -- spelling
 map("n", " ts", function()
 	vim.o.spell = verbose_toggle(vim.o.spell, "spelling")
 end, { noremap = true, desc = "Toggle spelling" })
-map("n", "<C-s>g", "z=1<cr><cr>", { noremap = true })
-vim.diagnostic.enable(false)
+map("n", "<c-s>g", "z=1<cr><cr>", { noremap = true, desc = "Correct word" })
+
 map("n", " td", function()
 	vim.diagnostic.enable(verbose_toggle(vim.diagnostic.is_enabled(), "diagnostics"))
 end, { desc = "Toggle diagnostics" })
@@ -112,5 +87,3 @@ vim.api.nvim_create_user_command("Scratch", function()
     setlocal noswapfile
     ]])
 end, {})
-
-map("n", "<M-b>", "<cmd>make<cr>", { desc = "Make" })