From c4f2a1e4cb5408dd1d23f7f6ca331778b4110600 Mon Sep 17 00:00:00 2001
From: Shadow Cat <shadowcatzero@protonmail.com>
Date: Sun, 21 Aug 2022 13:09:41 -0400
Subject: [PATCH] idr important stuff

---
 lua/config/plugins/lsp.lua       | 16 ++++++++--------
 lua/config/plugins/telescope.lua | 12 ++++++------
 lua/config/plugins/tree.lua      |  2 +-
 lua/config/settings.lua          | 15 +++++++++++++--
 lua/config/utils.lua             |  4 +++-
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/lua/config/plugins/lsp.lua b/lua/config/plugins/lsp.lua
index 69fc7bc..38fbcbf 100644
--- a/lua/config/plugins/lsp.lua
+++ b/lua/config/plugins/lsp.lua
@@ -4,7 +4,7 @@ local config = function()
     u.nmap('E', vim.diagnostic.open_float)
     u.nmap('[d', vim.diagnostic.goto_prev)
     u.nmap(']d', vim.diagnostic.goto_next)
-    u.nmap('<space>q', vim.diagnostic.setloclist)
+    u.nmap('<leader>q', vim.diagnostic.setloclist)
 
     local on_attach = function(_, bufnr)
         vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc')
@@ -24,15 +24,15 @@ local config = function()
         map('K', vim.lsp.buf.hover)
         map('<C-k>', vim.lsp.buf.signature_help)
 
-        map('<space>wa', vim.lsp.buf.add_workspace_folder)
-        map('<space>wr', vim.lsp.buf.remove_workspace_folder)
-        map('<space>wl', function()
+        map('<leader>wa', vim.lsp.buf.add_workspace_folder)
+        map('<leader>wr', vim.lsp.buf.remove_workspace_folder)
+        map('<leader>wl', function()
             print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
         end)
-        map('<space>D', vim.lsp.buf.type_definition)
-        map('<space>rn', vim.lsp.buf.rename)
-        map('<space>ca', vim.lsp.buf.code_action)
-        map('<space>fm', vim.lsp.buf.formatting)
+        map('<leader>D', vim.lsp.buf.type_definition)
+        map('<leader>rn', vim.lsp.buf.rename)
+        map('<leader>ca', vim.lsp.buf.code_action)
+        map('<leader>fm', vim.lsp.buf.formatting)
     end
 
     local capabilities = require 'cmp_nvim_lsp'.update_capabilities(
diff --git a/lua/config/plugins/telescope.lua b/lua/config/plugins/telescope.lua
index 0b84deb..96a7af0 100644
--- a/lua/config/plugins/telescope.lua
+++ b/lua/config/plugins/telescope.lua
@@ -8,10 +8,10 @@ return function(use)
 
             local u = require 'config.utils'.mapping
 
-            u.nmap('<space>ff', u.cmd('Telescope find_files'))
-            u.nmap('<space>fg', u.cmd('Telescope live_grep'))
-            u.nmap('<space>fb', u.cmd('Telescope buffers'))
-            u.nmap('<space>fh', u.cmd('Telescope help_tags'))
+            u.cmd('<leader>ff', 'Telescope find_files')
+            u.cmd('<leader>fg', 'Telescope live_grep')
+            u.cmd('<leader>fb', 'Telescope buffers')
+            u.cmd('<leader>fh', 'Telescope help_tags')
         end
     }
     use {
@@ -32,8 +32,8 @@ return function(use)
         config = function()
             require('icon-picker').setup {}
             local u = require 'config.utils'.mapping
-            u.nmap('<space>fi', u.cmd('IconPickerYank alt_font symbols nerd_font emoji'))
-            vim.keymap.set('i', '<c-i>', u.cmd('IconPickerInsert alt_font symbols nerd_font emoji'))
+            u.cmd('<leader>fi', 'IconPickerYank alt_font symbols nerd_font emoji')
+            vim.keymap.set('i', '<c-i>', '<cmd>IconPickerInsert alt_font symbols nerd_font emoji<cr>')
         end,
     })
 end
diff --git a/lua/config/plugins/tree.lua b/lua/config/plugins/tree.lua
index 8d7582c..af8d8d7 100644
--- a/lua/config/plugins/tree.lua
+++ b/lua/config/plugins/tree.lua
@@ -21,7 +21,7 @@ return function(use)
             }
 
             local u = require 'config.utils'.mapping
-            u.nmap('<space>e', u.cmd('Neotree toggle'))
+            u.cmd('<leader>e', 'Neotree toggle')
         end
     }
 end
diff --git a/lua/config/settings.lua b/lua/config/settings.lua
index 84c2db9..cbc7b9b 100644
--- a/lua/config/settings.lua
+++ b/lua/config/settings.lua
@@ -42,12 +42,23 @@ vim.diagnostic.config({
 -- terminal
 local m = u.mapping
 m.map('t', '<esc>', '<C-\\><C-n>')
-m.nmap('<space>tm', '<cmd>belowright 7sp<cr><cmd>term<cr><cmd>setlocal nonu<cr>A')
+m.map('t', '<C-n>', '<C-\\><C-n><C-w>h')
+m.map('t', '<C-e>', '<C-\\><C-n><C-w>j')
+m.map('t', '<C-i>', '<C-\\><C-n><C-w>k')
+m.map('t', '<C-o>', '<C-\\><C-n><C-w>l')
+m.nmap('<leader>tm', '<cmd>belowright 7sp<cr><cmd>term<cr><cmd>setlocal nonu<cr>A')
 
 -- off search highlight when escape is pressed
 m.nmap('<esc>', '<cmd>noh<cr><esc>')
 
--- colemak
+-- yank to clipboard
+m.map('v', '<leader>y', '"+y')
+
+-- spell checking
+m.cmd('<leader>sp', 'setlocal spell spelllang=en_us')
+m.cmd('<leader>nsp', 'setlocal nospell')
+
+-- colemak-dh
 local l = u.layout
 l.swap('n', 'h')
 l.swap('e', 'j')
diff --git a/lua/config/utils.lua b/lua/config/utils.lua
index 75a3b81..7ffaef9 100644
--- a/lua/config/utils.lua
+++ b/lua/config/utils.lua
@@ -4,7 +4,9 @@ local opts = { noremap = true, silent = true }
 local mapping = {}
 mapping.map = function(mode, from, to) vim.keymap.set(mode, from, to, opts) end
 mapping.nmap = function(from, to) vim.keymap.set('n', from, to, opts) end
-mapping.cmd = function(content) return '<cmd>' .. content .. '<cr>' end
+mapping.cmd = function(from, content)
+    vim.keymap.set('n', from, '<cmd>' .. content .. '<cr>', opts)
+end
 
 -- layout (mapping)
 local layout = {}