idr important stuff

This commit is contained in:
iris committed 2022-08-21 13:09:41 -04:00
1 parent d00a914e63
commit c4f2a1e4cb
5 files changed
+31 -18

No files matched your search

+8 -8
View File
@@ -4,7 +4,7 @@ local config = function()
u.nmap('E', vim.diagnostic.open_float) u.nmap('E', vim.diagnostic.open_float)
u.nmap('[d', vim.diagnostic.goto_prev) u.nmap('[d', vim.diagnostic.goto_prev)
u.nmap(']d', vim.diagnostic.goto_next) 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) local on_attach = function(_, bufnr)
vim.api.nvim_buf_set_option(bufnr, 'omnifunc', 'v:lua.vim.lsp.omnifunc') 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('K', vim.lsp.buf.hover)
map('<C-k>', vim.lsp.buf.signature_help) map('<C-k>', vim.lsp.buf.signature_help)
map('<space>wa', vim.lsp.buf.add_workspace_folder) map('<leader>wa', vim.lsp.buf.add_workspace_folder)
map('<space>wr', vim.lsp.buf.remove_workspace_folder) map('<leader>wr', vim.lsp.buf.remove_workspace_folder)
map('<space>wl', function() map('<leader>wl', function()
print(vim.inspect(vim.lsp.buf.list_workspace_folders())) print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
end) end)
map('<space>D', vim.lsp.buf.type_definition) map('<leader>D', vim.lsp.buf.type_definition)
map('<space>rn', vim.lsp.buf.rename) map('<leader>rn', vim.lsp.buf.rename)
map('<space>ca', vim.lsp.buf.code_action) map('<leader>ca', vim.lsp.buf.code_action)
map('<space>fm', vim.lsp.buf.formatting) map('<leader>fm', vim.lsp.buf.formatting)
end end
local capabilities = require 'cmp_nvim_lsp'.update_capabilities( local capabilities = require 'cmp_nvim_lsp'.update_capabilities(
+6 -6
View File
@@ -8,10 +8,10 @@ return function(use)
local u = require 'config.utils'.mapping local u = require 'config.utils'.mapping
u.nmap('<space>ff', u.cmd('Telescope find_files')) u.cmd('<leader>ff', 'Telescope find_files')
u.nmap('<space>fg', u.cmd('Telescope live_grep')) u.cmd('<leader>fg', 'Telescope live_grep')
u.nmap('<space>fb', u.cmd('Telescope buffers')) u.cmd('<leader>fb', 'Telescope buffers')
u.nmap('<space>fh', u.cmd('Telescope help_tags')) u.cmd('<leader>fh', 'Telescope help_tags')
end end
} }
use { use {
@@ -32,8 +32,8 @@ return function(use)
config = function() config = function()
require('icon-picker').setup {} require('icon-picker').setup {}
local u = require 'config.utils'.mapping local u = require 'config.utils'.mapping
u.nmap('<space>fi', u.cmd('IconPickerYank alt_font symbols nerd_font emoji')) u.cmd('<leader>fi', 'IconPickerYank alt_font symbols nerd_font emoji')
vim.keymap.set('i', '<c-i>', u.cmd('IconPickerInsert alt_font symbols nerd_font emoji')) vim.keymap.set('i', '<c-i>', '<cmd>IconPickerInsert alt_font symbols nerd_font emoji<cr>')
end, end,
}) })
end end
+1 -1
View File
@@ -21,7 +21,7 @@ return function(use)
} }
local u = require 'config.utils'.mapping local u = require 'config.utils'.mapping
u.nmap('<space>e', u.cmd('Neotree toggle')) u.cmd('<leader>e', 'Neotree toggle')
end end
} }
end end
+13 -2
View File
@@ -42,12 +42,23 @@ vim.diagnostic.config({
-- terminal -- terminal
local m = u.mapping local m = u.mapping
m.map('t', '<esc>', '<C-\\><C-n>') 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 -- off search highlight when escape is pressed
m.nmap('<esc>', '<cmd>noh<cr><esc>') 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 local l = u.layout
l.swap('n', 'h') l.swap('n', 'h')
l.swap('e', 'j') l.swap('e', 'j')
+3 -1
View File
@@ -4,7 +4,9 @@ local opts = { noremap = true, silent = true }
local mapping = {} local mapping = {}
mapping.map = function(mode, from, to) vim.keymap.set(mode, from, to, opts) end 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.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) -- layout (mapping)
local layout = {} local layout = {}