diff --git a/config/nvim/lua/keymaps.lua b/config/nvim/lua/keymaps.lua index 33289f3f..d2454cf3 100644 --- a/config/nvim/lua/keymaps.lua +++ b/config/nvim/lua/keymaps.lua @@ -24,7 +24,8 @@ local normal_mode_maps = { { key = '', map = [[lua require'dap'.step_out()]] }, { key = 'bb', map = [[lua require'dap'.toggle_breakpoint()]] }, { key = 'B', map = [[lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))]] }, - { key = 'lp', map = [[lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))]] }, + { key = 'lp', + map = [[lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))]] }, { key = 'dr', map = [[lua require'dap'.repl.open()]] }, { key = 'dl', map = [[lua require'dap'.run_last()]] }, @@ -44,8 +45,8 @@ local normal_mode_maps = { { key = 'rd', map = [[RustDebuggables]] }, { key = 'rr', map = [[RustRunnables]] }, - { key = 'Vdiff', map = [[vertical Gdiffsplit]] }, - { key = 'Vdiff!', map = [[vertical Gdiffsplit!]] }, + { key = 'Vff', map = [[vertical Gdiffsplit]] }, + { key = 'Vff!', map = [[vertical Gdiffsplit!]] }, { key = 'ssr', map = [[lua require'rust-tools'.ssr.ssr(query)]] }, -- Session @@ -57,6 +58,8 @@ local normal_mode_maps = { { key = '', map = [[lua vim.lsp.buf.definition()]] }, { key = 'gi', map = [[lua vim.lsp.buf.implementation()]] }, { key = 'o', map = [[TroubleToggle]] }, + { key = 'dd', map = [[lua require'dapui'.toggle()]] }, + -- { key = 'a', map = [[lua vim.lsp.buf.document_highlight()]] }, -- { key = 'c', map = [[lua vim.lsp.buf.clear_references()]] }, { key = '"', map = [["+]] }, @@ -68,6 +71,8 @@ local normal_mode_maps = { -- Other { key = 'm', map = [[silent !mpcfzf]] }, { key = 'l', map = [[Glow]] }, + { key = '', map = [[Telescope commands]] }, + } @@ -75,6 +80,7 @@ local insert_mode_maps = { { key = '', map = '' }, { key = "", map = 'copilot#Accept("")', options = { silent = true, expr = true } }, { key = "", map = 'copilot#Accept("")', options = { silent = true, expr = true } }, + { key = '', map = [[Telescope commands]] }, } diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 07b3d1ba..396677e8 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -125,7 +125,7 @@ return require('packer').startup(function() max_lines = 99, deadline = 500, unsafe = { "rm", "poweroff", "mv" } - }, + }, { src = "bc", short_name = "MATH", precision = 6 }, { src = "copilot", short_name = "COP", accept_key = "" }, { src = "dap" } @@ -189,7 +189,8 @@ return require('packer').startup(function() use 'ellisonleao/glow.nvim' - use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" } } + use { "rcarriga/nvim-dap-ui", requires = { "mfussenegger/nvim-dap" }, + config = function() require("dapui").setup() end } use { 'phaazon/hop.nvim', diff --git a/config/nvim/lua/setup/rust-tools.lua b/config/nvim/lua/setup/rust-tools.lua index 18ae6b88..0b90c5d5 100644 --- a/config/nvim/lua/setup/rust-tools.lua +++ b/config/nvim/lua/setup/rust-tools.lua @@ -2,8 +2,8 @@ -- local extension_path = vim.env.HOME .. '/.vscode/extensions/vadimcn.vscode-lldb-1.7.0' -- local codelldb_path = extension_path .. 'adapter/codelldb' -- local liblldb_path = extension_path .. 'lldb/lib/liblldb.dylib' -local codelldb_path = '/Users/fs0c131y/.vscode/extensions/vadimcn.vscode-lldb-1.6.9/adapter/codelldb' -local liblldb_path = '/Users/fs0c131y/.vscode/extensions/vadimcn.vscode-lldb-1.6.9/lldb/lib/liblldb.dylib' +local codelldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb-1.8.1-universal/adapter/codelldb' +local liblldb_path = '/Users/fs0c131y/.vscode-oss/extensions/vadimcn.vscode-lldb-1.8.1-universal/lldb/lib/liblldb.dylib' local rt = require('rust-tools') local lspstatus = require('lsp-status') local coq = require('coq') diff --git a/install.sh b/install.sh new file mode 100755 index 00000000..54093134 --- /dev/null +++ b/install.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# ensure_installed: +DOTFILES_REPO="https://github.com/uttarayan21/dotfiles" +INSTALLED="$HOME/.local/share/dotfiles" +git clone "$DOTFILES_REPO" "$INSTALLED" + +for file in "$INSTALLED"; do + ln -s "$file" $HOME/config/$(basename $file) +done