some shit
This commit is contained in:
parent
59b5bdce99
commit
4fb9a7aaf4
@ -429,7 +429,7 @@ colors:
|
|||||||
#working_directory: None
|
#working_directory: None
|
||||||
|
|
||||||
# Send ESC (\x1b) before characters when alt is pressed.
|
# Send ESC (\x1b) before characters when alt is pressed.
|
||||||
#alt_send_esc: true
|
alt_send_esc: true
|
||||||
|
|
||||||
#mouse:
|
#mouse:
|
||||||
# Click settings
|
# Click settings
|
||||||
|
@ -15,7 +15,7 @@ if u.has_plugin("cmp") then
|
|||||||
o.tabstop = 2
|
o.tabstop = 2
|
||||||
o.shiftwidth = 2 -- Indents will have a width of 4
|
o.shiftwidth = 2 -- Indents will have a width of 4
|
||||||
o.softtabstop = 2 -- Sets the number of columns for a TAB
|
o.softtabstop = 2 -- Sets the number of columns for a TAB
|
||||||
o.expandtab = false -- Dont expand TABs to spaces
|
o.expandtab = true -- Dont expand TABs to spaces
|
||||||
o.autoindent = true
|
o.autoindent = true
|
||||||
o.showmatch = true -- show matching brackets
|
o.showmatch = true -- show matching brackets
|
||||||
o.swapfile = false
|
o.swapfile = false
|
||||||
|
14
configs/nvim/lua/.pnpm-debug.log
Normal file
14
configs/nvim/lua/.pnpm-debug.log
Normal file
@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"0 debug pnpm:scope": {
|
||||||
|
"selected": 1
|
||||||
|
},
|
||||||
|
"1 error pnpm": {
|
||||||
|
"code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND",
|
||||||
|
"err": {
|
||||||
|
"name": "pnpm",
|
||||||
|
"message": "No package.json (or package.yaml, or package.json5) was found in \"/home/jim/.dotfiles/configs/nvim/lua\".",
|
||||||
|
"code": "ERR_PNPM_NO_IMPORTER_MANIFEST_FOUND",
|
||||||
|
"stack": "pnpm: No package.json (or package.yaml, or package.json5) was found in \"/home/jim/.dotfiles/configs/nvim/lua\".\n at readProjectManifest (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:40641:13)\n at async Object.readProjectManifestOnly (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:40645:28)\n at async Object.readProjectManifestOnly (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:40864:24)\n at async Object.handler (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:129763:24)\n at async /home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:133951:20\n at async run (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:133926:34)\n at async runPnpm (/home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:134137:5)\n at async /home/jim/.asdf/installs/nodejs/16.11.0/pnpm-global/5/node_modules/.pnpm/pnpm@6.17.2/node_modules/pnpm/dist/pnpm.cjs:134129:7"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -1,5 +1,6 @@
|
|||||||
local map = vim.api.nvim_set_keymap
|
local map = vim.api.nvim_set_keymap
|
||||||
local g = vim.g
|
local g = vim.g
|
||||||
|
local cmd = vim.cmd;
|
||||||
|
|
||||||
local options = {noremap = true}
|
local options = {noremap = true}
|
||||||
local remap = {noremap = false}
|
local remap = {noremap = false}
|
||||||
@ -12,21 +13,19 @@ map("n", "<C-p>", ":Telescope find_files<CR>", options)
|
|||||||
--map("n", "<C-f>", ":Telescope grep_string<CR>", options)
|
--map("n", "<C-f>", ":Telescope grep_string<CR>", options)
|
||||||
map("n", "<C-f>", ":Telescope live_grep<CR>", options)
|
map("n", "<C-f>", ":Telescope live_grep<CR>", options)
|
||||||
|
|
||||||
map("n", "<Leader>c", ":CodeActionMenu<CR>", remap)
|
|
||||||
|
|
||||||
-- LSP Functionality
|
-- LSP Functionality
|
||||||
map("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", options)
|
map("n", "gD", "<Cmd>lua vim.lsp.buf.declaration()<CR>", options)
|
||||||
map("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", options)
|
map("n", "gd", "<Cmd>lua vim.lsp.buf.definition()<CR>", options)
|
||||||
map("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", options)
|
map("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", options)
|
||||||
map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", options)
|
map("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", options)
|
||||||
map("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", options)
|
map("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", options)
|
||||||
map("n", "<Leader>e", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", options)
|
map("n", "<Leader>e", "<cmd>lua vim.lsp.diagnostic.show_line_diagnostics()<CR>", options)
|
||||||
map("n", "<Leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", options)
|
map("n", "<Leader>rn", "<cmd>lua vim.lsp.buf.rename()<CR>", options)
|
||||||
map("n", "<Leader><C-f>", "<cmd>lua vim.lsp.buf.code_action()<CR>", options)
|
map("n", "<Leader>c", "<cmd>lua vim.lsp.buf.code_action()<CR>", options)
|
||||||
map("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", options)
|
map("n", "<Leader><C-f>", "<cmd>lua vim.lsp.buf.formatting()<CR>", options)
|
||||||
map("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", options)
|
map("n", "[d", "<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>", options)
|
||||||
|
map("n", "]d", "<cmd>lua vim.lsp.diagnostic.goto_next()<CR>", options)
|
||||||
|
|
||||||
|
|
||||||
-- Navigate Buffers
|
-- Navigate Buffers
|
||||||
map("n", "<C-h>", "<C-w>h", options)
|
map("n", "<C-h>", "<C-w>h", options)
|
||||||
@ -34,6 +33,18 @@ map("n", "<C-j>", "<C-w>j", options)
|
|||||||
map("n", "<C-k>", "<C-w>k", options)
|
map("n", "<C-k>", "<C-w>k", options)
|
||||||
map("n", "<C-l>", "<C-w>l", options)
|
map("n", "<C-l>", "<C-w>l", options)
|
||||||
|
|
||||||
|
map("n", "Y", "yy", options)
|
||||||
|
map("n", "<Leader>k", "{",options)
|
||||||
|
map("n", "<Leader>j", "}",options)
|
||||||
|
|
||||||
|
map("n", "<Leader><C-j>", "<cmd>move +1<CR>", options)
|
||||||
|
map("n", "<Leader><C-k>", "<cmd>move -2<CR>", options)
|
||||||
|
|
||||||
|
-- Faster git merge
|
||||||
|
map("n", "<Leader>gd", ":Gvdiffsplit!<CR>", options)
|
||||||
|
map("n", "<Leader>gdl", ":diffget //3<CR>", options)
|
||||||
|
map("n", "<Leader>gdh", ":diffget //2<CR>", options)
|
||||||
|
|
||||||
-- Find file in NvimTree
|
-- Find file in NvimTree
|
||||||
map("n", "<Leader>f", ":NvimTreeFindFile<CR><c-w>", options)
|
map("n", "<Leader>f", ":NvimTreeFindFile<CR><c-w>", options)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user