diff --git a/.zshrc b/.zshrc index 3a8780f..5ff7196 100644 --- a/.zshrc +++ b/.zshrc @@ -36,7 +36,7 @@ alias :q='exit' alias gh='git push origin' alias gl='git pull origin' alias gm='git commit -m' - +alias g+='bear -- g++ -Wextra -Werror -std=c++20' # zoxide ## ============================================================================= diff --git a/nvim/README.md b/nvim/README.md index 638d596..0e187c7 100644 --- a/nvim/README.md +++ b/nvim/README.md @@ -15,8 +15,7 @@ ## Nerd Tree | key | Description | | --- | ------------------------- | -| t |toggle open | -| f | focus tree | +| f |toggle open | ## buffer switching | key | Description | @@ -37,6 +36,16 @@ | fb | find buffers | | fh | help for functions etc | | fp | find projects | +| fb | file browser | + +### telescope git +| key | Description | +| ---------- | ------------------------- | +| gq | show commits | +| gw | show commits with diff | +| ge | show branches | +| gr | show git status | +| ga | show git stash | ### project telescope @@ -87,13 +96,14 @@ Note, these require the cmp list view to be open to do anything! ## LSP | key | Description | | ----------- | ---------------------- | -| Leader + h | go to declaration | -| Leader + j | go to definition | -| Leader + k | go to implementation | -| Leader + l | go to references | -| Leader + ; | execute code actions | -| Leader + u | signature help | -| Leader + g | hover | +| Leader + a | go to declaration | +| Leader + s | go to definition | +| Leader + d | go to type definitions | +| Leader + f | go to references | +| Leader + q | execute code actions | +| Leader + w | signature help | +| Leader + e | hover | +| Leader + r | rename | ## snippets These require you to be inside a snippet! diff --git a/nvim/lua/settings/keymaps.lua b/nvim/lua/settings/keymaps.lua index 2095a7b..b4c7142 100644 --- a/nvim/lua/settings/keymaps.lua +++ b/nvim/lua/settings/keymaps.lua @@ -20,11 +20,20 @@ keymap("n", "", ":BufferNext", opts) -- formatting keymap("n", "", ":lua vim.lsp.buf.format { async = true }", opts) -keymap("n", "q", ":Telescope lsp_definitions", opts) -keymap("n", "w", ":Telescope lsp_references", opts) -keymap("n", "e", ":Telescope lsp_type_definitions", opts) -keymap("n", "a", ":lua vim.lsp.buf.code_action()", opts) -keymap("n", "s", ":lua vim.lsp.buf.signature_help()", opts) +keymap("n", "a", ":Telescope lsp_definitions", opts) +keymap("n", "s", ":Telescope lsp_references", opts) +keymap("n", "d", ":Telescope lsp_type_definitions", opts) +keymap("n", "f", ":Telescope lsp_implementations", opts) +keymap("n", "q", ":lua vim.lsp.buf.code_action()", opts) +keymap("n", "w", ":lua vim.lsp.buf.signature_help()", opts) +keymap("n", "e", ":lua vim.lsp.buf.hover()", opts) +keymap("n", "r", ":lua vim.lsp.buf.rename()", opts) +keymap("n", "gq", ":lua require('telescope.builtin').git_commits()", opts) +keymap("n", "gw", ":lua require('telescope.builtin').git_bcommits()", opts) +keymap("n", "ge", ":lua require('telescope.builtin').git_branches()", opts) +keymap("n", "gr", ":lua require('telescope.builtin').git_status()", opts) +keymap("n", "ga", ":lua require('telescope.builtin').git_stash()", opts) + -- harpoon man diff --git a/nvim/lua/settings/vimtex.lua b/nvim/lua/settings/vimtex.lua index ce1d4c5..5272847 100644 --- a/nvim/lua/settings/vimtex.lua +++ b/nvim/lua/settings/vimtex.lua @@ -1,4 +1,4 @@ vim.cmd("let g:vimtex_quickfix_mode=0") vim.cmd("let g:vimtex_view_general_viewer = 'evince'") vim.cmd("let g:vimtex_compiler_method = 'latexmk'") -vim.cmd("let g:vimtex_latexmk_options = '-pdf -shell-escape -verbose -file-line-error -synctex=1 -interaction=nonstopmode'") +vim.cmd("let g:vimtex_compiler_latexmk = {'options': ['-pdf', '-shell-escape', '-file-line-error', '-synctex=1', '-interaction=nonstopmode',],}")
normal mode insert mode